MINOR: Update google-java-format and test Java 25 in CI

Author: lidavidm

.github/workflows/test.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [17, 21, 23]
+        jdk: [17, 21, 25]
         maven: [3.9.9]
         image: [ubuntu, conda-jni-cdata]
         include:

adapter/avro/src/main/java/org/apache/arrow/adapter/avro/ArrowToAvroUtils.java

@@ -601,7 +601,7 @@ private static BaseAvroProducer<?> createProducer(
       case VARCHAR:
         return new AvroStringProducer((VarCharVector) vector);
 
-        // Logical types
+      // Logical types
 
       case DECIMAL:
         return new AvroDecimalProducer((DecimalVector) vector);
@@ -636,7 +636,7 @@ private static BaseAvroProducer<?> createProducer(
       case TIMESTAMPNANOTZ:
         return new AvroTimestampNanoTzProducer((TimeStampNanoTZVector) vector);
 
-        // Complex types
+      // Complex types
 
       case STRUCT:
         StructVector structVector = (StructVector) vector;
@@ -679,9 +679,9 @@ private static BaseAvroProducer<?> createProducer(
             new AvroStructProducer(entryVector, new Producer<?>[] {keyProducer, valueProducer});
         return new AvroMapProducer(mapVector, entryProducer);
 
-        // Support for UNION and DENSEUNION is not currently available
-        // This is pending fixes in the implementation of the union vectors themselves
-        // https://github.com/apache/arrow-java/issues/108
+      // Support for UNION and DENSEUNION is not currently available
+      // This is pending fixes in the implementation of the union vectors themselves
+      // https://github.com/apache/arrow-java/issues/108
 
       default:
         // Not all Arrow types are supported for encoding (yet)!

pom.xml

@@ -738,7 +738,7 @@ under the License.
           </pom>
           <java>
             <googleJavaFormat>
-              <version>1.17.0</version>
+              <version>1.36.1</version>
               <style>GOOGLE</style>
             </googleJavaFormat>
             <licenseHeader>

vector/src/main/java/org/apache/arrow/vector/ValueVector.java

@@ -53,10 +53,8 @@
  * <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).
- *
  * </blockquote>
  */
 public interface ValueVector extends Closeable, Iterable<ValueVector> {

vector/src/main/java/org/apache/arrow/vector/util/Text.java

@@ -488,7 +488,7 @@ private static Optional<Integer> validateUTF8Internal(byte[] utf8, int start, in
           if (leadByte == 0xED && aByte > 0x9F) {
             return Optional.of(count);
           }
-          // falls through to regular trail-byte test!!
+        // falls through to regular trail-byte test!!
         case TRAIL_BYTE:
           if (aByte < 0x80 || aByte > 0xBF) {
             return Optional.of(count);
@@ -793,23 +793,23 @@ public static int bytesToCodePoint(ByteBuffer bytes) {
       case 5:
         ch += (bytes.get() & 0xFF);
         ch <<= 6; /* remember, illegal UTF-8 */
-        // fall through
+      // fall through
       case 4:
         ch += (bytes.get() & 0xFF);
         ch <<= 6; /* remember, illegal UTF-8 */
-        // fall through
+      // fall through
       case 3:
         ch += (bytes.get() & 0xFF);
         ch <<= 6;
-        // fall through
+      // fall through
       case 2:
         ch += (bytes.get() & 0xFF);
         ch <<= 6;
-        // fall through
+      // fall through
       case 1:
         ch += (bytes.get() & 0xFF);
         ch <<= 6;
-        // fall through
+      // fall through
       case 0:
         ch += (bytes.get() & 0xFF);
         break;