diff --git a/.github/ISSUE_TEMPLATE/usage_question.yaml b/.github/ISSUE_TEMPLATE/usage_question.yaml
index f8e0a7bc7c..d928ffcd71 100644
--- a/.github/ISSUE_TEMPLATE/usage_question.yaml
+++ b/.github/ISSUE_TEMPLATE/usage_question.yaml
@@ -23,21 +23,21 @@ body:
   - type: markdown
     attributes:
       value: >
-        While we enable issues as a mechanism for new contributors and passers-by who 
-        are unfamiliar with Apache Software Foundation projects to ask questions and 
-        interact with the project, we encourage users to ask such questions on public 
+        While we enable issues as a mechanism for new contributors and passers-by who
+        are unfamiliar with Apache Software Foundation projects to ask questions and
+        interact with the project, we encourage users to ask such questions on public
         mailing lists:
-        
-        * Development discussions: dev@arrow.apache.org (first subscribe by sending an 
+
+        * Development discussions: dev@arrow.apache.org (first subscribe by sending an
         e-mail to dev-subscribe@arrow.apache.org).
-        
-        * User discussions: user@arrow.apache.org (first subscribe by sending an e-mail 
+
+        * User discussions: user@arrow.apache.org (first subscribe by sending an e-mail
         to user-subscribe@arrow.apache.org).
-        
+
         * Mailing list archives: https://arrow.apache.org/community/
-        
-        
-        Do not be surprised by responses to issues raised here directing you to those 
+
+
+        Do not be surprised by responses to issues raised here directing you to those
         mailing lists, or to report a bug or feature request here.
 
 
@@ -45,8 +45,8 @@ body:
   - type: textarea
     id: description
     attributes:
-      label: > 
-        Describe the usage question you have. Please include as many useful details as 
+      label: >
+        Describe the usage question you have. Please include as many useful details as
         possible.
     validations:
       required: true
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
new file mode 100644
index 0000000000..2ac230f635
--- /dev/null
+++ b/.github/workflows/dev.yml
@@ -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.
+
+name: Dev
+
+on:
+  pull_request: {}
+  push: {}
+
+concurrency:
+  group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  pre-commit:
+    name: "pre-commit"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - name: pre-commit (cache)
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: pre-commit (--all-files)
+        run: |
+          python -m pip install pre-commit
+          pre-commit run --show-diff-on-failure --color=always --all-files
diff --git a/.gitignore b/.gitignore
index 63c90af7b7..ca0ac32463 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,13 +11,18 @@
 .idea/
 .project
 .settings/
-/build/
 /*-build/
+/.mvn/.develocity/
+/build/
+/dev/release/apache-rat-0.16.1.jar
+/dev/release/filtered_rat.txt
+/dev/release/rat.xml
 CMakeCache.txt
 CMakeFiles/
 Makefile
 TAGS
 arrow-git.properties
 cmake_install.cmake
+dependency-reduced-pom.xml
 install_manifest.txt
 target/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000..63b7ab9f91
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+      - id: file-contents-sorter
+        files: .gitignore
+
+  - repo: local
+    hooks:
+      - id: rat
+        name: Release Audit Tool
+        language: system
+        entry: |
+          bash -c " \
+            git archive HEAD \
+              --prefix=apache-arrow-go/ \
+              --output=apache-arrow-go.tar.gz && \
+              dev/release/run_rat.sh apache-arrow-go.tar.gz"
+        always_run: true
+        pass_filenames: false
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 2efe740b77..fc51858f9f 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -21,4 +21,4 @@
 
 * [Code of Conduct for The Apache Software Foundation][1]
 
-[1]: https://www.apache.org/foundation/policies/conduct.html
\ No newline at end of file
+[1]: https://www.apache.org/foundation/policies/conduct.html
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9adceb41c1..8388b1d6c7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,11 +21,11 @@
 
 ## Did you find a bug?
 
-The Arrow Java project uses GitHub as a bug tracker.  To report a bug, sign in 
+The Arrow Java project uses GitHub as a bug tracker.  To report a bug, sign in
 to your GitHub account, navigate to [GitHub issues](https://github.com/apache/arrow-java/issues)
 and click on **New issue** .
 
-Before you create a new bug entry, we recommend you first search among 
+Before you create a new bug entry, we recommend you first search among
 existing Arrow issues in [GitHub](https://github.com/apache/arrow-java/issues).
 
 ## Did you write a patch that fixes a bug or brings an improvement?
diff --git a/adapter/jdbc/src/test/resources/h2/comment.sql b/adapter/jdbc/src/test/resources/h2/comment.sql
index db8964fe1d..2eac74e020 100644
--- a/adapter/jdbc/src/test/resources/h2/comment.sql
+++ b/adapter/jdbc/src/test/resources/h2/comment.sql
@@ -18,4 +18,4 @@ create table table1(
 COMMENT ON TABLE table1 IS 'This is super special table with valuable data';
 COMMENT ON COLUMN table1.id IS 'Record identifier';
 COMMENT ON COLUMN table1.name IS 'Name of record';
-COMMENT ON COLUMN table1.columnN IS 'Informative description of columnN';
\ No newline at end of file
+COMMENT ON COLUMN table1.columnN IS 'Informative description of columnN';
diff --git a/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml
index c4f0017095..56d0d95952 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_h2.yml
@@ -66,7 +66,7 @@ data:
   PARSEDATETIME(''2018-02-12 GMT'', ''yyyy-MM-dd z''), PARSEDATETIME(''2018-02-12 12:45:35 GMT'', ''yyyy-MM-dd HH:mm:ss z''),
   ''736f6d6520746578742074686174206e6565647320746f20626520636f6e76657274656420746f2062696e617279'', ''some text that needs to be converted to varchar'',
   ''736f6d6520746578742074686174206e6565647320746f20626520636f6e76657274656420746f2062696e617279'', ''some text that needs to be converted to clob'', ''some char text'', 1, null, ARRAY[],''{"s":"t"}'');'
- 
+
 query: 'select int_field1, bool_field2, tinyint_field3, smallint_field4, bigint_field5, decimal_field6, double_field7, real_field8,
         time_field9, date_field10, timestamp_field11, binary_field12, varchar_field13, blob_field14, clob_field15, char_field16, bit_field17, null_field18, list_field19, map_field20 from table1'
 
@@ -77,7 +77,7 @@ rowCount: '10'
 values:
  - 'INT_FIELD1=101,102,103,104,null,null,107,108,109,110'
  - 'BOOL_FIELD2=1,1,1,1,1,1,1,1,1,1'
- - 'BIT_FIELD17=1,1,1,1,1,1,1,1,1,1' 
+ - 'BIT_FIELD17=1,1,1,1,1,1,1,1,1,1'
  - 'TINYINT_FIELD3=45,45,45,45,45,45,45,45,45,45'
  - 'SMALLINT_FIELD4=12000,12000,12000,12000,12000,12000,12000,12000,12000,12000'
  - 'BIGINT_FIELD5=92233720,92233720,92233720,92233720,92233720,92233720,92233720,92233720,92233720,92233720'
@@ -120,4 +120,4 @@ values:
  		 some text that needs to be converted to clob,some text that needs to be converted to clob,
  		 some text that needs to be converted to clob,some text that needs to be converted to clob'
  - 'LIST_FIELD19=(1;2;3),(1;2),(1),(2;3;4),(2;3),(2),(3;4;5),(3;4),(3),()'
- - 'MAP_FIELD20={"a":"b"|"key":"12345"},{"c":"d"},{"e":"f"},{"g":"h"},{"i":"j"},{"k":"l"},{"m":"n"},{"o":"p"},{"q":"r"},{"s":"t"}'
\ No newline at end of file
+ - 'MAP_FIELD20={"a":"b"|"key":"12345"},{"c":"d"},{"e":"f"},{"g":"h"},{"i":"j"},{"k":"l"},{"m":"n"},{"o":"p"},{"q":"r"},{"s":"t"}'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml
index 9be76229da..26446aad82 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_all_datatypes_null_h2.yml
@@ -19,16 +19,16 @@ vectors:
  - 'TINYINT_FIELD3'
  - 'SMALLINT_FIELD4'
  - 'BIGINT_FIELD5'
- - 'DECIMAL_FIELD6' 
+ - 'DECIMAL_FIELD6'
  - 'DOUBLE_FIELD7'
  - 'REAL_FIELD8'
  - 'TIME_FIELD9'
- - 'DATE_FIELD10' 
+ - 'DATE_FIELD10'
  - 'TIMESTAMP_FIELD11'
  - 'BINARY_FIELD12'
  - 'VARCHAR_FIELD13'
  - 'BLOB_FIELD14'
- - 'CLOB_FIELD15' 
+ - 'CLOB_FIELD15'
  - 'CHAR_FIELD16'
  - 'BIT_FIELD17'
  - 'LIST_FIELD19'
@@ -52,4 +52,4 @@ query: 'select int_field1, bool_field2, tinyint_field3, smallint_field4, bigint_
         time_field9, date_field10, timestamp_field11, binary_field12, varchar_field13, blob_field14, clob_field15, char_field16, bit_field17,
         list_field19 from table1'
 
-drop: 'DROP table table1;'
\ No newline at end of file
+drop: 'DROP table table1;'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml
index 2e60a4af5a..f2348aae2b 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_charset_ch_h2.yml
@@ -40,4 +40,4 @@ values:
  			一些帶有char編碼的文本需要轉換為varchar,一些帶有char編碼的文本需要轉換為varchar'
  - 'CLOB_FIELD15=一些带有char编码的文本需要转换为clob,一些带有char编码的文本需要转换为clob,一些带有char编码的文本需要转换为clob,
  		 一些带有char编码的文本需要转换为clob,一些带有char编码的文本需要转换为clob'
- - 'CHAR_FIELD16=一些char编码的字符文本,一些char编码的字符文本,一些char编码的字符文本,一些char编码的字符文本,一些char编码的字符文本'
\ No newline at end of file
+ - 'CHAR_FIELD16=一些char编码的字符文本,一些char编码的字符文本,一些char编码的字符文本,一些char编码的字符文本,一些char编码的字符文本'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml
index 383681e5b3..409ebc25cc 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_charset_h2.yml
@@ -50,4 +50,4 @@ values:
  		 some text with char encoding that needs to be converted to clob,some text with char encoding that needs to be converted to clob,
  		 some text with char encoding that needs to be converted to clob,some text with char encoding that needs to be converted to clob'
  - 'CHAR_FIELD16=some char text with char encoding,some char text with char encoding,some char text with char encoding,some char text with char encoding,some char text with char encoding,
- 		 some char text with char encoding,some char text with char encoding,some char text with char encoding,some char text with char encoding,some char text with char encoding'
\ No newline at end of file
+ 		 some char text with char encoding,some char text with char encoding,some char text with char encoding,some char text with char encoding,some char text with char encoding'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml
index 9b3cf9a18f..a00eaaf61e 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_charset_jp_h2.yml
@@ -40,4 +40,4 @@ values:
  			varcharに変換する必要があるcharエンコーディングのテキスト,varcharに変換する必要があるcharエンコーディングのテキスト'
  - 'CLOB_FIELD15=charエンコーディングのあるテキストをclobに変換する必要がある,charエンコーディングのあるテキストをclobに変換する必要がある,charエンコーディングのあるテキストをclobに変換する必要がある,
  		 charエンコーディングのあるテキストをclobに変換する必要がある,charエンコーディングのあるテキストをclobに変換する必要がある'
- - 'CHAR_FIELD16=charエンコーディングのあるcharテキスト,charエンコーディングのあるcharテキスト,charエンコーディングのあるcharテキスト,charエンコーディングのあるcharテキスト,charエンコーディングのあるcharテキスト'
\ No newline at end of file
+ - 'CHAR_FIELD16=charエンコーディングのあるcharテキスト,charエンコーディングのあるcharテキスト,charエンコーディングのあるcharテキスト,charエンコーディングのあるcharテキスト,charエンコーディングのあるcharテキスト'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml
index d6e051c094..906b17fabb 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_charset_kr_h2.yml
@@ -40,4 +40,4 @@ values:
  			char 인코딩을 사용하는 일부 텍스트를 varchar로 변환해야합니다.,char 인코딩을 사용하는 일부 텍스트를 varchar로 변환해야합니다.'
  - 'CLOB_FIELD15=clob로 변환해야하는 char 인코딩을 가진 텍스트,clob로 변환해야하는 char 인코딩을 가진 텍스트,clob로 변환해야하는 char 인코딩을 가진 텍스트,
  		 clob로 변환해야하는 char 인코딩을 가진 텍스트,clob로 변환해야하는 char 인코딩을 가진 텍스트'
- - 'CHAR_FIELD16=char 인코딩을 사용한 char 텍스트,char 인코딩을 사용한 char 텍스트,char 인코딩을 사용한 char 텍스트,char 인코딩을 사용한 char 텍스트,char 인코딩을 사용한 char 텍스트'
\ No newline at end of file
+ - 'CHAR_FIELD16=char 인코딩을 사용한 char 텍스트,char 인코딩을 사용한 char 텍스트,char 인코딩을 사용한 char 텍스트,char 인코딩을 사용한 char 텍스트,char 인코딩을 사용한 char 텍스트'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml
index 318a2c5851..e5e36ec9b4 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_est_timestamp_h2.yml
@@ -46,4 +46,3 @@ values:
  - '1518457535000'
  - '1518457535000'
  - '1518457535000'
- 
\ No newline at end of file
diff --git a/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml
index 66bfc6b44f..f7a308d316 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_gmt_date_h2.yml
@@ -45,4 +45,4 @@ values:
  - '17574'
  - '17574'
  - '17574'
- - '17574'
\ No newline at end of file
+ - '17574'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml
index 1a6902d45d..65ce74516a 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_gmt_time_h2.yml
@@ -45,4 +45,4 @@ values:
  - '45935000'
  - '45935000'
  - '45935000'
- - '45935000'
\ No newline at end of file
+ - '45935000'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml
index b3059a0721..034a878887 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_gmt_timestamp_h2.yml
@@ -45,4 +45,4 @@ values:
  - '1518439535000'
  - '1518439535000'
  - '1518439535000'
- - '1518439535000'
\ No newline at end of file
+ - '1518439535000'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_int_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_int_h2.yml
index 8e8a8c4931..a05b2c5e7f 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_int_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_int_h2.yml
@@ -31,16 +31,16 @@ data:
 
 values:
   - '101'
-  - '101'  
-  - '101'  
   - '101'
-  - '101'  
-  - '101' 
-  - '101'  
-  - '101'  
-  - '101'  
   - '101'
-     
+  - '101'
+  - '101'
+  - '101'
+  - '101'
+  - '101'
+  - '101'
+  - '101'
+
 query: 'select int_field1 from table1;'
 
 drop: 'DROP table table1;'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_map_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_map_h2.yml
index a1800d20af..b57602cd24 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_map_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_map_h2.yml
@@ -30,4 +30,4 @@ query: 'select map_field20 from table1;'
 drop: 'DROP table table1;'
 
 values:
-  - 'MAP_FIELD20={"a":"b"|"123":"qwerty"|"zxcvb":"!"},{"a":"b"|"123":"qwerty"|"c":"d"},{"":"value"},{"nonEmptyKey":null|"someOtherKey":""}'
\ No newline at end of file
+  - 'MAP_FIELD20={"a":"b"|"123":"qwerty"|"zxcvb":"!"},{"a":"b"|"123":"qwerty"|"c":"d"},{"":"value"},{"nonEmptyKey":null|"someOtherKey":""}'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_null_and_notnull.yml b/adapter/jdbc/src/test/resources/h2/test1_null_and_notnull.yml
index 904b27783a..46e98b2a8b 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_null_and_notnull.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_null_and_notnull.yml
@@ -23,4 +23,4 @@ rowCount: '2'
 
 query: 'select int_field_null, int_field_notnull from table1;'
 
-drop: 'DROP table table1;'
\ No newline at end of file
+drop: 'DROP table table1;'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_null_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_null_h2.yml
index a33b18105a..0744ba235f 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_null_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_null_h2.yml
@@ -30,7 +30,7 @@ data:
   - 'INSERT INTO table1 VALUES (null);'
   - 'INSERT INTO table1 VALUES (null);'
   - 'INSERT INTO table1 VALUES (null);'
-     
+
 query: 'select null_field18 from table1;'
 
 drop: 'DROP table table1;'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml
index 6923537c6c..08d1960df5 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_pst_date_h2.yml
@@ -45,4 +45,4 @@ values:
  - '17574'
  - '17574'
  - '17574'
- - '17574'
\ No newline at end of file
+ - '17574'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml
index f8faaead34..9e2a8766fc 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_pst_time_h2.yml
@@ -45,4 +45,4 @@ values:
  - '74735000'
  - '74735000'
  - '74735000'
- - '74735000'
\ No newline at end of file
+ - '74735000'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml
index 632479fce2..aa94e9e70e 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_pst_timestamp_h2.yml
@@ -45,4 +45,4 @@ values:
  - '1518468335000'
  - '1518468335000'
  - '1518468335000'
- - '1518468335000'
\ No newline at end of file
+ - '1518468335000'
diff --git a/adapter/jdbc/src/test/resources/h2/test1_selected_datatypes_null_h2.yml b/adapter/jdbc/src/test/resources/h2/test1_selected_datatypes_null_h2.yml
index 60a4462272..6c367fb46d 100644
--- a/adapter/jdbc/src/test/resources/h2/test1_selected_datatypes_null_h2.yml
+++ b/adapter/jdbc/src/test/resources/h2/test1_selected_datatypes_null_h2.yml
@@ -15,16 +15,16 @@ type: 'selected_null_column'
 
 vectors:
  - 'BIGINT_FIELD5'
- - 'DECIMAL_FIELD6' 
+ - 'DECIMAL_FIELD6'
  - 'DOUBLE_FIELD7'
  - 'REAL_FIELD8'
  - 'TIME_FIELD9'
- - 'DATE_FIELD10' 
+ - 'DATE_FIELD10'
  - 'TIMESTAMP_FIELD11'
  - 'BINARY_FIELD12'
  - 'VARCHAR_FIELD13'
  - 'BLOB_FIELD14'
- - 'CLOB_FIELD15' 
+ - 'CLOB_FIELD15'
  - 'CHAR_FIELD16'
  - 'BIT_FIELD17'
  - 'LIST_FIELD19'
@@ -46,4 +46,4 @@ data:
 
 query: 'select bigint_field5, decimal_field6, double_field7, real_field8, time_field9, date_field10, timestamp_field11, binary_field12, varchar_field13, blob_field14, clob_field15, char_field16, bit_field17, list_field19, map_field20 from table1'
 
-drop: 'DROP table table1;'
\ No newline at end of file
+drop: 'DROP table table1;'
diff --git a/c/src/test/python/integration_tests.py b/c/src/test/python/integration_tests.py
index 3e14be11c4..0b522cfb0c 100644
--- a/c/src/test/python/integration_tests.py
+++ b/c/src/test/python/integration_tests.py
@@ -356,7 +356,7 @@ def test_listview_array(self):
         self.round_trip_array(lambda: pa.array(
             [[], [0], [1, 2], [4, 5, 6]], pa.list_view(pa.int64())
             # disabled check_metadata since in Java API the listview
-            # internal field name ("item") is not preserved 
+            # internal field name ("item") is not preserved
             # during round trips (it becomes "$data$").
         ), check_metadata=False)
 
@@ -399,7 +399,7 @@ def recreate_batch():
                     return reader.read_next_batch()
 
         self.round_trip_record_batch(recreate_batch)
-    
+
     def test_runendencoded_array(self):
         # empty vector
         self.round_trip_array(lambda: pa.RunEndEncodedArray.from_arrays([], [], pa.run_end_encoded(pa.int64(), pa.int64())))
diff --git a/dataset/src/test/resources/substrait/local_files_users.json b/dataset/src/test/resources/substrait/local_files_users.json
index a2f5af1b3b..b4d699e25f 100644
--- a/dataset/src/test/resources/substrait/local_files_users.json
+++ b/dataset/src/test/resources/substrait/local_files_users.json
@@ -72,4 +72,4 @@
     }
   }],
   "expectedTypeUrls": []
-}
\ No newline at end of file
+}
diff --git a/dataset/src/test/resources/substrait/named_table_users.json b/dataset/src/test/resources/substrait/named_table_users.json
index 629eebd059..70934e64e8 100644
--- a/dataset/src/test/resources/substrait/named_table_users.json
+++ b/dataset/src/test/resources/substrait/named_table_users.json
@@ -67,4 +67,4 @@
     }
   }],
   "expectedTypeUrls": []
-}
\ No newline at end of file
+}
diff --git a/dev/release/check_rat_report.py b/dev/release/check_rat_report.py
new file mode 100755
index 0000000000..c45baa060c
--- /dev/null
+++ b/dev/release/check_rat_report.py
@@ -0,0 +1,59 @@
+#!/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 fnmatch
+import re
+import sys
+import xml.etree.ElementTree as ET
+
+if len(sys.argv) != 3:
+    sys.stderr.write("Usage: %s exclude_globs.lst rat_report.xml\n" %
+                     sys.argv[0])
+    sys.exit(1)
+
+exclude_globs_filename = sys.argv[1]
+xml_filename = sys.argv[2]
+
+globs = [line.strip() for line in open(exclude_globs_filename, "r")]
+
+tree = ET.parse(xml_filename)
+root = tree.getroot()
+resources = root.findall('resource')
+
+all_ok = True
+for r in resources:
+    approvals = r.findall('license-approval')
+    if not approvals or approvals[0].attrib['name'] == 'true':
+        continue
+    clean_name = re.sub('^[^/]+/', '', r.attrib['name'])
+    excluded = False
+    for g in globs:
+        if fnmatch.fnmatch(clean_name, g):
+            excluded = True
+            break
+    if not excluded:
+        sys.stdout.write("NOT APPROVED: %s (%s): %s\n" % (
+            clean_name, r.attrib['name'], approvals[0].attrib['name']))
+        all_ok = False
+
+if not all_ok:
+    sys.exit(1)
+
+print('OK')
+sys.exit(0)
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
new file mode 100644
index 0000000000..76cde3070b
--- /dev/null
+++ b/dev/release/rat_exclude_files.txt
@@ -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.
+
+dataset/src/test/resources/data/student.csv
diff --git a/dev/release/run_rat.sh b/dev/release/run_rat.sh
new file mode 100755
index 0000000000..210436920d
--- /dev/null
+++ b/dev/release/run_rat.sh
@@ -0,0 +1,54 @@
+#!/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 -eu
+
+RELEASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+RAT_VERSION=0.16.1
+
+RAT_JAR="${RELEASE_DIR}/apache-rat-${RAT_VERSION}.jar"
+if [ ! -f "${RAT_JAR}" ]; then
+  curl \
+    --fail \
+    --output "${RAT_JAR}" \
+    --show-error \
+    --silent \
+    https://repo1.maven.org/maven2/org/apache/rat/apache-rat/${RAT_VERSION}/apache-rat-${RAT_VERSION}.jar
+fi
+
+RAT_XML="${RELEASE_DIR}/rat.xml"
+java \
+  -jar "${RAT_JAR}" \
+  --out "${RAT_XML}" \
+  --xml \
+  "$1"
+FILTERED_RAT_TXT="${RELEASE_DIR}/filtered_rat.txt"
+if ${PYTHON:-python3} \
+  "${RELEASE_DIR}/check_rat_report.py" \
+  "${RELEASE_DIR}/rat_exclude_files.txt" \
+  "${RAT_XML}" > \
+  "${FILTERED_RAT_TXT}"; then
+  echo "No unapproved licenses"
+else
+  cat "${FILTERED_RAT_TXT}"
+  N_UNAPPROVED=$(grep -c "NOT APPROVED" "${FILTERED_RAT_TXT}")
+  echo "${N_UNAPPROVED} unapproved licenses. Check Rat report: ${RAT_XML}"
+  exit 1
+fi
diff --git a/flight/flight-core/src/test/proto/perf.proto b/flight/flight-core/src/test/proto/perf.proto
index 99f35a9e65..5d28410f4f 100644
--- a/flight/flight-core/src/test/proto/perf.proto
+++ b/flight/flight-core/src/test/proto/perf.proto
@@ -34,12 +34,11 @@ message Token {
 
   // definition of entire flight.
   Perf definition = 1;
-  
+
   // inclusive start
   int64 start = 2;
-  
+
   // exclusive end
   int64 end = 3;
-  
-}
 
+}
diff --git a/flight/flight-sql-jdbc-core/src/main/resources/META-INF/services/java.sql.Driver b/flight/flight-sql-jdbc-core/src/main/resources/META-INF/services/java.sql.Driver
index 83cfb23427..130d10d64d 100644
--- a/flight/flight-sql-jdbc-core/src/main/resources/META-INF/services/java.sql.Driver
+++ b/flight/flight-sql-jdbc-core/src/main/resources/META-INF/services/java.sql.Driver
@@ -12,4 +12,4 @@
 # WITHOUT 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.driver.jdbc.ArrowFlightJdbcDriver
\ No newline at end of file
+org.apache.arrow.driver.jdbc.ArrowFlightJdbcDriver
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Binary.java b/format/src/main/java/org/apache/arrow/flatbuf/Binary.java
index 1d07674285..65b3f4f577 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Binary.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Binary.java
@@ -58,4 +58,3 @@ public static final class Vector extends BaseVector {
     public Binary get(Binary obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java b/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java
index d76cf70b9b..f20245ca28 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java
@@ -64,4 +64,3 @@ public static final class Vector extends BaseVector {
     public BinaryView get(BinaryView obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Block.java b/format/src/main/java/org/apache/arrow/flatbuf/Block.java
index f844e815cd..df3835e1e7 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Block.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Block.java
@@ -68,4 +68,3 @@ public static final class Vector extends BaseVector {
     public Block get(Block obj, int j) {  return obj.__assign(__element(j), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java b/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java
index e5c93a6b75..a7e4288467 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java
@@ -80,4 +80,3 @@ public static final class Vector extends BaseVector {
     public BodyCompression get(BodyCompression obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java b/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java
index 91f846cc60..80f05de275 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java
@@ -39,4 +39,3 @@ private BodyCompressionMethod() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Bool.java b/format/src/main/java/org/apache/arrow/flatbuf/Bool.java
index d1b61c3d30..7d03705ec8 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Bool.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Bool.java
@@ -55,4 +55,3 @@ public static final class Vector extends BaseVector {
     public Bool get(Bool obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Buffer.java b/format/src/main/java/org/apache/arrow/flatbuf/Buffer.java
index 6451f0fdae..94a3f04f3e 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Buffer.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Buffer.java
@@ -70,4 +70,3 @@ public static final class Vector extends BaseVector {
     public Buffer get(Buffer obj, int j) {  return obj.__assign(__element(j), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java b/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java
index 4a7467c0b2..7b3b27701b 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java
@@ -26,4 +26,3 @@ private CompressionType() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Date.java b/format/src/main/java/org/apache/arrow/flatbuf/Date.java
index 9ad3a523fe..b9af04b120 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Date.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Date.java
@@ -72,4 +72,3 @@ public static final class Vector extends BaseVector {
     public Date get(Date obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java b/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java
index 6d1116e733..577ddb4afc 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java
@@ -26,4 +26,3 @@ private DateUnit() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java b/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java
index 13b13dd917..e2f38558d4 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java
@@ -88,4 +88,3 @@ public static final class Vector extends BaseVector {
     public Decimal get(Decimal obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java b/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java
index b29097d8a5..891df5d164 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java
@@ -86,4 +86,3 @@ public static final class Vector extends BaseVector {
     public DictionaryBatch get(DictionaryBatch obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java b/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java
index 6b94889dc8..28c52d579e 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java
@@ -95,4 +95,3 @@ public static final class Vector extends BaseVector {
     public DictionaryEncoding get(DictionaryEncoding obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java b/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java
index 7039b0522c..5e9717f1b8 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java
@@ -32,4 +32,3 @@ private DictionaryKind() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Duration.java b/format/src/main/java/org/apache/arrow/flatbuf/Duration.java
index 86974b611b..442310dbfd 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Duration.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Duration.java
@@ -64,4 +64,3 @@ public static final class Vector extends BaseVector {
     public Duration get(Duration obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java b/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java
index f033ccb583..34444a55e3 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java
@@ -30,4 +30,3 @@ private Endianness() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Feature.java b/format/src/main/java/org/apache/arrow/flatbuf/Feature.java
index cad9b75c16..4365fb3af3 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Feature.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Feature.java
@@ -54,4 +54,3 @@ private Feature() { }
    */
   public static final long COMPRESSED_BODY = 2L;
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Field.java b/format/src/main/java/org/apache/arrow/flatbuf/Field.java
index 28d6fd1bad..9cd50d0b98 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Field.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Field.java
@@ -127,4 +127,3 @@ public static final class Vector extends BaseVector {
     public Field get(Field obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/FieldNode.java b/format/src/main/java/org/apache/arrow/flatbuf/FieldNode.java
index 77f2cd1ca1..21b7d387c9 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/FieldNode.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/FieldNode.java
@@ -75,4 +75,3 @@ public static final class Vector extends BaseVector {
     public FieldNode get(FieldNode obj, int j) {  return obj.__assign(__element(j), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java b/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java
index c09e428d6f..7c4c08567f 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java
@@ -67,4 +67,3 @@ public static final class Vector extends BaseVector {
     public FixedSizeBinary get(FixedSizeBinary obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java b/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java
index d36cd8359f..44eceafee6 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java
@@ -67,4 +67,3 @@ public static final class Vector extends BaseVector {
     public FixedSizeList get(FixedSizeList obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java b/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java
index 72ec44d3ad..59741cde59 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java
@@ -64,4 +64,3 @@ public static final class Vector extends BaseVector {
     public FloatingPoint get(FloatingPoint obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Footer.java b/format/src/main/java/org/apache/arrow/flatbuf/Footer.java
index 63f32d33ca..156215b202 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Footer.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Footer.java
@@ -107,4 +107,3 @@ public static final class Vector extends BaseVector {
     public Footer get(Footer obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Int.java b/format/src/main/java/org/apache/arrow/flatbuf/Int.java
index 5a12d82ee7..9dd1d448a4 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Int.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Int.java
@@ -68,4 +68,3 @@ public static final class Vector extends BaseVector {
     public Int get(Int obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Interval.java b/format/src/main/java/org/apache/arrow/flatbuf/Interval.java
index 6598d48580..7b2be74c5c 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Interval.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Interval.java
@@ -64,4 +64,3 @@ public static final class Vector extends BaseVector {
     public Interval get(Interval obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java b/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java
index 45b47fdf67..6b8031d415 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java
@@ -27,4 +27,3 @@ private IntervalUnit() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java b/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java
index bc64bb32e5..8f242ef3a9 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java
@@ -77,4 +77,3 @@ public static final class Vector extends BaseVector {
     public KeyValue get(KeyValue obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java b/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java
index d32b284644..72135992a0 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java
@@ -59,4 +59,3 @@ public static final class Vector extends BaseVector {
     public LargeBinary get(LargeBinary obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java b/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java
index d5ad4d1600..1cce67712d 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java
@@ -59,4 +59,3 @@ public static final class Vector extends BaseVector {
     public LargeList get(LargeList obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java b/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java
index fff70d20e2..234ce35f68 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java
@@ -59,4 +59,3 @@ public static final class Vector extends BaseVector {
     public LargeListView get(LargeListView obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java b/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java
index 83e2800204..377bfbb2cf 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java
@@ -59,4 +59,3 @@ public static final class Vector extends BaseVector {
     public LargeUtf8 get(LargeUtf8 obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/List.java b/format/src/main/java/org/apache/arrow/flatbuf/List.java
index 2dbd917144..7f06dda072 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/List.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/List.java
@@ -55,4 +55,3 @@ public static final class Vector extends BaseVector {
     public List get(List obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/ListView.java b/format/src/main/java/org/apache/arrow/flatbuf/ListView.java
index 387b2b9662..5d87df5e4c 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/ListView.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/ListView.java
@@ -60,4 +60,3 @@ public static final class Vector extends BaseVector {
     public ListView get(ListView obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Map.java b/format/src/main/java/org/apache/arrow/flatbuf/Map.java
index 5a100fb173..10652c0544 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Map.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Map.java
@@ -94,4 +94,3 @@ public static final class Vector extends BaseVector {
     public Map get(Map obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Message.java b/format/src/main/java/org/apache/arrow/flatbuf/Message.java
index 2349b8053a..f2518f9046 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Message.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Message.java
@@ -88,4 +88,3 @@ public static final class Vector extends BaseVector {
     public Message get(Message obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java b/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java
index f2be733f4b..d393455338 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java
@@ -40,4 +40,3 @@ private MessageHeader() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java b/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java
index cbfa0ee90f..e35ce1e84e 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java
@@ -50,4 +50,3 @@ private MetadataVersion() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Null.java b/format/src/main/java/org/apache/arrow/flatbuf/Null.java
index 37cb705ec1..60196193ea 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Null.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Null.java
@@ -58,4 +58,3 @@ public static final class Vector extends BaseVector {
     public Null get(Null obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Precision.java b/format/src/main/java/org/apache/arrow/flatbuf/Precision.java
index e2140834ff..b21beccc8b 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Precision.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Precision.java
@@ -27,4 +27,3 @@ private Precision() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java b/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java
index 78208064ec..83deda7480 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java
@@ -137,4 +137,3 @@ public static final class Vector extends BaseVector {
     public RecordBatch get(RecordBatch obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java b/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java
index 4ad73827b9..070ad9499e 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java
@@ -36,7 +36,7 @@
 /**
  * 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 
+ * 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.
  */
@@ -62,4 +62,3 @@ public static final class Vector extends BaseVector {
     public RunEndEncoded get(RunEndEncoded obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Schema.java b/format/src/main/java/org/apache/arrow/flatbuf/Schema.java
index 52c0ab26f0..373071f4bb 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Schema.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Schema.java
@@ -109,4 +109,3 @@ public static final class Vector extends BaseVector {
     public Schema get(Schema obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java b/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java
index 160b783fe2..1cf92c9fac 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java
@@ -26,4 +26,3 @@ private SparseMatrixCompressedAxis() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java b/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java
index 9fc345aa4a..e5c1dc8a6f 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java
@@ -121,4 +121,3 @@ public static final class Vector extends BaseVector {
     public SparseMatrixIndexCSX get(SparseMatrixIndexCSX obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java b/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java
index 3d01281204..6ca7f29f12 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java
@@ -99,4 +99,3 @@ public static final class Vector extends BaseVector {
     public SparseTensor get(SparseTensor obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java b/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java
index b05aef44b2..5043a60c2c 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java
@@ -28,4 +28,3 @@ private SparseTensorIndex() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java b/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java
index 3ce2092133..b43915c6af 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java
@@ -125,4 +125,3 @@ public static final class Vector extends BaseVector {
     public SparseTensorIndexCOO get(SparseTensorIndexCOO obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java b/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java
index 91bb3574fd..a32e29a6e8 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java
@@ -180,4 +180,3 @@ public static final class Vector extends BaseVector {
     public SparseTensorIndexCSF get(SparseTensorIndexCSF obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java b/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java
index 3af1c91f08..9065d30067 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java
@@ -60,4 +60,3 @@ public static final class Vector extends BaseVector {
     public Struct_ get(Struct_ obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java b/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java
index 4fd4646738..7bba1e3455 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java
@@ -98,4 +98,3 @@ public static final class Vector extends BaseVector {
     public Tensor get(Tensor obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java b/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java
index 1ebaa8c433..566ec2e3a2 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java
@@ -81,4 +81,3 @@ public static final class Vector extends BaseVector {
     public TensorDim get(TensorDim obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Time.java b/format/src/main/java/org/apache/arrow/flatbuf/Time.java
index 63bee08ce6..0c635ea103 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Time.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Time.java
@@ -84,4 +84,3 @@ public static final class Vector extends BaseVector {
     public Time get(Time obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java b/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java
index 0df6867609..a862cdc066 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java
@@ -28,4 +28,3 @@ private TimeUnit() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java b/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java
index d45d866daf..2f33b2ee5e 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java
@@ -189,4 +189,3 @@ public static final class Vector extends BaseVector {
     public Timestamp get(Timestamp obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Type.java b/format/src/main/java/org/apache/arrow/flatbuf/Type.java
index ba0f665f64..f45a02fbb0 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Type.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Type.java
@@ -56,4 +56,3 @@ private Type() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Union.java b/format/src/main/java/org/apache/arrow/flatbuf/Union.java
index 70f007833d..9c3c6b8e3e 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Union.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Union.java
@@ -81,4 +81,3 @@ public static final class Vector extends BaseVector {
     public Union get(Union obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java b/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java
index 3f3eb8c728..94e1486587 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java
@@ -26,4 +26,3 @@ private UnionMode() { }
 
   public static String name(int e) { return names[e]; }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java b/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java
index 62e2eb45d5..6aa4baa7b7 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java
@@ -58,4 +58,3 @@ public static final class Vector extends BaseVector {
     public Utf8 get(Utf8 obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java b/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java
index 7929695635..1da9ef27f3 100644
--- a/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java
+++ b/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java
@@ -64,4 +64,3 @@ public static final class Vector extends BaseVector {
     public Utf8View get(Utf8View obj, int j) {  return obj.__assign(__indirect(__element(j), bb), bb); }
   }
 }
-
diff --git a/vector/src/main/codegen/includes/license.ftl b/vector/src/main/codegen/includes/license.ftl
index c6a5afeef5..3e7c6c26f5 100644
--- a/vector/src/main/codegen/includes/license.ftl
+++ b/vector/src/main/codegen/includes/license.ftl
@@ -13,4 +13,4 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
\ No newline at end of file
+ */
diff --git a/vector/src/main/codegen/includes/vv_imports.ftl b/vector/src/main/codegen/includes/vv_imports.ftl
index f4c72a1a6c..7f216a7b43 100644
--- a/vector/src/main/codegen/includes/vv_imports.ftl
+++ b/vector/src/main/codegen/includes/vv_imports.ftl
@@ -54,5 +54,3 @@ import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.Period;
 import java.time.ZonedDateTime;
-
-
diff --git a/vector/src/main/codegen/templates/AbstractFieldReader.java b/vector/src/main/codegen/templates/AbstractFieldReader.java
index e3c8729469..25b071fab7 100644
--- a/vector/src/main/codegen/templates/AbstractFieldReader.java
+++ b/vector/src/main/codegen/templates/AbstractFieldReader.java
@@ -127,6 +127,3 @@ private void fail(String name) {
     throw new IllegalArgumentException(String.format("You tried to read a [%s] type when you are using a field reader of type [%s].", name, this.getClass().getSimpleName()));
   }
 }
-
-
-
diff --git a/vector/src/main/codegen/templates/AbstractFieldWriter.java b/vector/src/main/codegen/templates/AbstractFieldWriter.java
index 5ebfb6877f..cc2cc618d8 100644
--- a/vector/src/main/codegen/templates/AbstractFieldWriter.java
+++ b/vector/src/main/codegen/templates/AbstractFieldWriter.java
@@ -173,9 +173,9 @@ public void writeNull() {
 
   /**
    * This implementation returns {@code false}.
-   * <p>  
+   * <p>
    *   Must be overridden by struct writers.
-   * </p>  
+   * </p>
    */
   @Override
   public boolean isEmptyStruct() {
diff --git a/vector/src/main/codegen/templates/ArrowType.java b/vector/src/main/codegen/templates/ArrowType.java
index b08d4ad0af..fd35c1cd2b 100644
--- a/vector/src/main/codegen/templates/ArrowType.java
+++ b/vector/src/main/codegen/templates/ArrowType.java
@@ -179,7 +179,7 @@ public static Decimal createDecimal(
 
     /**
      * Construct Decimal with 128 bits.
-     * 
+     *
      * This is kept mainly for the sake of backward compatibility.
      * Please use {@link org.apache.arrow.vector.types.pojo.ArrowType.Decimal#Decimal(int, int, int)} instead.
      *
@@ -371,5 +371,3 @@ public static Int getInt(org.apache.arrow.flatbuf.Field field) {
     return new Int(intType.bitWidth(), intType.isSigned());
   }
 }
-
-
diff --git a/vector/src/main/codegen/templates/BaseReader.java b/vector/src/main/codegen/templates/BaseReader.java
index 85d582a53b..e75e8a2974 100644
--- a/vector/src/main/codegen/templates/BaseReader.java
+++ b/vector/src/main/codegen/templates/BaseReader.java
@@ -44,17 +44,17 @@ public interface BaseReader extends Positionable{
   public interface StructReader extends BaseReader, Iterable<String>{
     FieldReader reader(String name);
   }
-  
+
   public interface RepeatedStructReader extends StructReader{
     boolean next();
     int size();
     void copyAsValue(StructWriter writer);
   }
-  
+
   public interface ListReader extends BaseReader{
-    FieldReader reader(); 
+    FieldReader reader();
   }
-  
+
   public interface RepeatedListReader extends ListReader{
     boolean next();
     int size();
@@ -70,11 +70,11 @@ public interface RepeatedMapReader extends MapReader{
     int size();
     void copyAsValue(MapWriter writer);
   }
-  
-  public interface ScalarReader extends  
-  <#list vv.types as type><#list type.minor as minor><#assign name = minor.class?cap_first /> ${name}Reader, </#list></#list> 
+
+  public interface ScalarReader extends
+  <#list vv.types as type><#list type.minor as minor><#assign name = minor.class?cap_first /> ${name}Reader, </#list></#list>
   BaseReader {}
-  
+
   interface ComplexReader{
     StructReader rootAsStruct();
     ListReader rootAsList();
@@ -82,4 +82,3 @@ interface ComplexReader{
     boolean ok();
   }
 }
-
diff --git a/vector/src/main/codegen/templates/ComplexCopier.java b/vector/src/main/codegen/templates/ComplexCopier.java
index 5adad52312..4fff7059a7 100644
--- a/vector/src/main/codegen/templates/ComplexCopier.java
+++ b/vector/src/main/codegen/templates/ComplexCopier.java
@@ -151,7 +151,7 @@ private static FieldWriter getStructWriterForReader(FieldReader reader, StructWr
         return (FieldWriter) writer.${uncappedName}(name);
       }
     </#if>
-    
+
     </#list></#list>
     case STRUCT:
       return (FieldWriter) writer.struct(name);
diff --git a/vector/src/main/codegen/templates/ComplexReaders.java b/vector/src/main/codegen/templates/ComplexReaders.java
index 48fb6603ad..b1a4f3e065 100644
--- a/vector/src/main/codegen/templates/ComplexReaders.java
+++ b/vector/src/main/codegen/templates/ComplexReaders.java
@@ -51,9 +51,9 @@
  */
 @SuppressWarnings("unused")
 public class ${name}ReaderImpl extends AbstractFieldReader {
-  
+
   private final ${name}Vector vector;
-  
+
   public ${name}ReaderImpl(${name}Vector vector){
     super();
     this.vector = vector;
@@ -66,7 +66,7 @@ public MinorType getMinorType(){
   public Field getField(){
     return vector.getField();
   }
-  
+
   public boolean isSet(){
     return !vector.isNull(idx());
   }
@@ -75,7 +75,7 @@ public void copyAsValue(${minor.class?cap_first}Writer writer){
     ${minor.class?cap_first}WriterImpl impl = (${minor.class?cap_first}WriterImpl) writer;
     impl.vector.copyFromSafe(idx(), impl.idx(), vector);
   }
-  
+
   public void copyAsField(String name, StructWriter writer){
     ${minor.class?cap_first}WriterImpl impl = (${minor.class?cap_first}WriterImpl) writer.${lowerName}(name);
     impl.vector.copyFromSafe(idx(), impl.idx(), vector);
@@ -90,7 +90,7 @@ public void read(${minor.class?cap_first}Holder h){
   public void read(Nullable${minor.class?cap_first}Holder h){
     vector.get(idx(), h);
   }
-  
+
   public ${friendlyType} read${safeType}(){
     return vector.getObject(idx());
   }
@@ -104,11 +104,11 @@ public void read(Nullable${minor.class?cap_first}Holder h){
     return vector.get(idx());
   }
   </#if>
-  
+
   public void copyValue(FieldWriter w){
-    
+
   }
-  
+
   public Object readObject(){
     return (Object)vector.getObject(idx());
   }
@@ -126,7 +126,7 @@ public Object readObject(){
  */
 @SuppressWarnings("unused")
 public interface ${name}Reader extends BaseReader{
-  
+
   public void read(${minor.class?cap_first}Holder h);
   public void read(Nullable${minor.class?cap_first}Holder h);
   public Object readObject();
@@ -135,7 +135,7 @@ public interface ${name}Reader extends BaseReader{
   public boolean isSet();
   public void copyAsValue(${minor.class}Writer writer);
   public void copyAsField(String name, ${minor.class}Writer writer);
-  
+
 }
 
 
@@ -143,5 +143,3 @@ public interface ${name}Reader extends BaseReader{
 </#list>
 </#list>
 </#list>
-
-
diff --git a/vector/src/main/codegen/templates/ComplexWriters.java b/vector/src/main/codegen/templates/ComplexWriters.java
index 2e3caae1f0..072adbd7ff 100644
--- a/vector/src/main/codegen/templates/ComplexWriters.java
+++ b/vector/src/main/codegen/templates/ComplexWriters.java
@@ -186,7 +186,7 @@ public void write(Nullable${minor.class}Holder h){
   }
   </#if>
 
-  
+
   public void writeNull() {
     vector.setNull(idx());
     vector.setValueCount(idx()+1);
diff --git a/vector/src/main/codegen/templates/NullReader.java b/vector/src/main/codegen/templates/NullReader.java
index 0c65f9a56b..1d77248e96 100644
--- a/vector/src/main/codegen/templates/NullReader.java
+++ b/vector/src/main/codegen/templates/NullReader.java
@@ -33,12 +33,12 @@
  */
 @SuppressWarnings("unused")
 public class NullReader extends AbstractBaseReader implements FieldReader{
-  
+
   public static final NullReader INSTANCE = new NullReader();
   public static final NullReader EMPTY_LIST_INSTANCE = new NullReader(MinorType.NULL);
   public static final NullReader EMPTY_STRUCT_INSTANCE = new NullReader(MinorType.STRUCT);
   private MinorType type;
-  
+
   private NullReader(){
     super();
     type = MinorType.NULL;
@@ -77,7 +77,7 @@ public void read(Nullable${name}Holder holder){
   public void read(int arrayIndex, ${name}Holder holder){
     throw new ArrayIndexOutOfBoundsException();
   }
-  
+
   public void copyAsValue(${minor.class}Writer writer){}
   public void copyAsField(String name, ${minor.class}Writer writer){}
 
@@ -85,63 +85,60 @@ public void read(int arrayIndex, Nullable${name}Holder holder){
     throw new ArrayIndexOutOfBoundsException();
   }
   </#list></#list>
-  
+
   public int size(){
     return 0;
   }
-  
+
   public boolean isSet(){
     return false;
   }
-  
+
   public boolean next(){
     return false;
   }
-  
+
   public RepeatedStructReader struct(){
     return this;
   }
-  
+
   public RepeatedListReader list(){
     return this;
   }
-  
+
   public StructReader struct(String name){
     return this;
   }
-  
+
   public ListReader list(String name){
     return this;
   }
-  
+
   public FieldReader reader(String name){
     return this;
   }
-  
+
   public FieldReader reader(){
     return this;
   }
-  
+
   private void fail(String name){
     throw new IllegalArgumentException(String.format("You tried to read a %s type when you are using a ValueReader of type %s.", name, this.getClass().getSimpleName()));
   }
-  
+
   <#list ["Object", "BigDecimal", "Short", "Integer", "Long", "Boolean",
           "LocalDateTime", "Duration", "Period", "Double", "Float",
           "Character", "Text", "String", "Byte", "byte[]", "PeriodDuration"] as friendlyType>
   <#assign safeType=friendlyType />
   <#if safeType=="byte[]"><#assign safeType="ByteArray" /></#if>
-  
+
   public ${friendlyType} read${safeType}(int arrayIndex){
     return null;
   }
-  
+
   public ${friendlyType} read${safeType}(){
     return null;
   }
   </#list>
-  
-}
-
-
 
+}
diff --git a/vector/src/main/codegen/templates/StructWriters.java b/vector/src/main/codegen/templates/StructWriters.java
index 3e6258a0c6..3e6b9fd773 100644
--- a/vector/src/main/codegen/templates/StructWriters.java
+++ b/vector/src/main/codegen/templates/StructWriters.java
@@ -333,7 +333,7 @@ public void end() {
               <#list minor.typeParams?reverse as typeParam>
                 <#assign constructorParams = constructorParams + [ typeParam.name ] />
               </#list>
-            </#if>    
+            </#if>
             new ${minor.arrowType}(${constructorParams?join(", ")}<#if minor.class?starts_with("Decimal")>, ${vectName}Vector.TYPE_WIDTH * 8</#if>)
           <#else>
             MinorType.${upperName}.getType()
@@ -347,7 +347,7 @@ public void end() {
           vector.setInitialCapacity(this.initialCapacity);
         }
         vector.allocateNewSafe();
-      } 
+      }
       writer.setPosition(idx());
       fields.put(handleCase(name), writer);
     } else {
diff --git a/vector/src/main/codegen/templates/UnionFixedSizeListWriter.java b/vector/src/main/codegen/templates/UnionFixedSizeListWriter.java
index 3436e3a967..f6e3f63caf 100644
--- a/vector/src/main/codegen/templates/UnionFixedSizeListWriter.java
+++ b/vector/src/main/codegen/templates/UnionFixedSizeListWriter.java
@@ -222,7 +222,7 @@ public void write(DecimalHolder holder) {
     writer.write(holder);
     writer.setPosition(writer.idx() + 1);
   }
- 
+
   @Override
   public void write(Decimal256Holder holder) {
     if (writer.idx() >= (idx() + 1) * listSize) {
diff --git a/vector/src/main/codegen/templates/UnionReader.java b/vector/src/main/codegen/templates/UnionReader.java
index 68e30ef488..96ad3e1b9b 100644
--- a/vector/src/main/codegen/templates/UnionReader.java
+++ b/vector/src/main/codegen/templates/UnionReader.java
@@ -43,7 +43,7 @@ public class UnionReader extends AbstractFieldReader {
 
   private BaseReader[] readers = new BaseReader[NUM_SUPPORTED_TYPES];
   public UnionVector data;
-  
+
   public UnionReader(UnionVector data) {
     this.data = data;
   }
diff --git a/vector/src/main/codegen/templates/ValueHolders.java b/vector/src/main/codegen/templates/ValueHolders.java
index 2a2bbe81b2..d59da14e08 100644
--- a/vector/src/main/codegen/templates/ValueHolders.java
+++ b/vector/src/main/codegen/templates/ValueHolders.java
@@ -31,12 +31,12 @@
  * Source code generated using FreeMarker template ${.template_name}
  */
 public final class ${className} implements ValueHolder{
-  
+
     <#if mode.name == "Repeated">
-    
+
     /** The first index (inclusive) into the Vector. **/
     public int start;
-    
+
     /** The last index (exclusive) into the Vector. **/
     public int end;
 
@@ -46,7 +46,7 @@ public final class ${className} implements ValueHolder{
     <#else>
 
     public static final int WIDTH = ${type.width};
-    
+
     <#if mode.name == "Optional">public int isSet;
     <#else>public final int isSet = 1;</#if>
     <#assign fields = (minor.fields!type.fields) + (minor.typeParams![]) />
@@ -74,4 +74,4 @@ public String toString(){
 
 </#list>
 </#list>
-</#list>
\ No newline at end of file
+</#list>