Apply spotless

Author: martin-traverse

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

@@ -14,13 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
-import org.apache.avro.file.*;
-
 import java.nio.ByteBuffer;
-
+import org.apache.avro.file.*;
 
 public class AvroCompression {
 
@@ -63,8 +60,7 @@ public ByteBuffer decompress(ByteBuffer buffer) {
 
     @Override
     public boolean equals(Object other) {
-      if (this == other)
-        return true;
+      if (this == other) return true;
       return (other != null && other.getClass() == getClass());
     }
 
@@ -73,5 +69,4 @@ public int hashCode() {
       return 2;
     }
   }
-
-}
+}

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

@@ -14,9 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
+import java.io.*;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 import org.apache.arrow.adapter.avro.consumers.CompositeAvroConsumer;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.FieldVector;
@@ -29,14 +34,6 @@
 import org.apache.avro.io.BinaryDecoder;
 import org.apache.avro.io.DecoderFactory;
 
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-
 class AvroFileReader implements DictionaryProvider {
 
   // Writer owns a channel / decoder and will close them
@@ -69,20 +66,18 @@ class AvroFileReader implements DictionaryProvider {
 
   // Create a new AvroFileReader for the input stream
   // In order to support non-blocking mode, the stream must support mark / reset
-  public AvroFileReader(
-      InputStream stream,
-      BufferAllocator allocator,
-      boolean blocking) {
+  public AvroFileReader(InputStream stream, BufferAllocator allocator, boolean blocking) {
 
-    this.stream =stream;
+    this.stream = stream;
     this.allocator = allocator;
     this.blocking = blocking;
 
     if (blocking) {
       this.decoder = DecoderFactory.get().binaryDecoder(stream, null);
     } else {
       if (!stream.markSupported()) {
-        throw new IllegalArgumentException("Input stream must support mark/reset for non-blocking mode");
+        throw new IllegalArgumentException(
+            "Input stream must support mark/reset for non-blocking mode");
       }
       this.decoder = DecoderFactory.get().directBinaryDecoder(stream, null);
     }
@@ -107,9 +102,8 @@ void readHeader() throws IOException {
     headerSize += magic.length;
 
     // Validate Avro magic
-    int validateMagic = BinaryData.compareBytes(
-        AVRO_MAGIC, 0, AVRO_MAGIC.length,
-        magic, 0, AVRO_MAGIC.length);
+    int validateMagic =
+        BinaryData.compareBytes(AVRO_MAGIC, 0, AVRO_MAGIC.length, magic, 0, AVRO_MAGIC.length);
 
     if (validateMagic != 0) {
       throw new RuntimeException("Invalid AVRO data file: The file is not an Avro file");
@@ -126,7 +120,7 @@ void readHeader() throws IOException {
         ByteBuffer valueBuffer = decoder.readBytes(null);
 
         headerSize += zigzagSize(keyBuffer.remaining()) + keyBuffer.remaining();
-        headerSize += zigzagSize(valueBuffer.remaining()) +  valueBuffer.remaining();
+        headerSize += zigzagSize(valueBuffer.remaining()) + valueBuffer.remaining();
 
         String key = new String(keyBuffer.array(), StandardCharsets.UTF_8);
 
@@ -186,8 +180,7 @@ private String processCodec(ByteBuffer buffer) {
 
     if (buffer != null && buffer.remaining() > 0) {
       return new String(buffer.array(), StandardCharsets.UTF_8);
-    }
-    else {
+    } else {
       return DataFileConstants.NULL_CODEC;
     }
   }
@@ -242,22 +235,24 @@ boolean readBatch() throws IOException {
     decoder.readFixed(batchSyncMarker);
 
     long batchSize =
-        zigzagSize(nRows) +
-        zigzagSize(batchBuffer.remaining()) +
-        batchBuffer.remaining() +
-        SYNC_MARKER_SIZE;
+        zigzagSize(nRows)
+            + zigzagSize(batchBuffer.remaining())
+            + batchBuffer.remaining()
+            + SYNC_MARKER_SIZE;
 
     // Validate sync marker - mismatch indicates a corrupt file
-    int validateMarker = BinaryData.compareBytes(
-        syncMarker, 0, SYNC_MARKER_SIZE,
-        batchSyncMarker, 0, SYNC_MARKER_SIZE);
+    int validateMarker =
+        BinaryData.compareBytes(
+            syncMarker, 0, SYNC_MARKER_SIZE, batchSyncMarker, 0, SYNC_MARKER_SIZE);
 
     if (validateMarker != 0) {
       throw new RuntimeException("Invalid AVRO data file: The file is corrupted");
     }
 
     // Reset producers
-    recordConsumer.getConsumers().forEach(consumer -> ensureCapacity(consumer.getVector(), (int) nRows));
+    recordConsumer
+        .getConsumers()
+        .forEach(consumer -> ensureCapacity(consumer.getVector(), (int) nRows));
     recordConsumer.getConsumers().forEach(consumer -> consumer.setPosition(0));
 
     // Decompress the batch buffer using Avro's codecs
@@ -299,7 +294,7 @@ boolean hasNextBatch() throws IOException {
     }
 
     if (blocking) {
-      return ! decoder.isEnd();
+      return !decoder.isEnd();
     }
 
     var in = decoder.inputStream();
@@ -311,8 +306,7 @@ boolean hasNextBatch() throws IOException {
       in.reset();
 
       return nextByte >= 0;
-    }
-    catch(EOFException e) {
+    } catch (EOFException e) {
       return false;
     }
   }

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

@@ -14,9 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
 import org.apache.arrow.adapter.avro.producers.CompositeAvroProducer;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
@@ -27,16 +34,6 @@
 import org.apache.avro.io.Encoder;
 import org.apache.avro.io.EncoderFactory;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-
 class AvroFileWriter {
 
   // Use magic from Avro's own constants
@@ -56,11 +53,8 @@ class AvroFileWriter {
   private final CompositeAvroProducer recordProducer;
   private final Codec avroCodec;
 
-
   public AvroFileWriter(
-      OutputStream stream,
-      VectorSchemaRoot firstBatch,
-      DictionaryProvider dictionaries)
+      OutputStream stream, VectorSchemaRoot firstBatch, DictionaryProvider dictionaries)
       throws IOException {
 
     this(stream, firstBatch, dictionaries, null);
@@ -73,24 +67,22 @@ public AvroFileWriter(
       String codecName)
       throws IOException {
 
-      EncoderFactory encoderFactory = EncoderFactory.get();
+    EncoderFactory encoderFactory = EncoderFactory.get();
 
-      this.stream = stream;
-      this.encoder = encoderFactory.binaryEncoder(stream, null);
+    this.stream = stream;
+    this.encoder = encoderFactory.binaryEncoder(stream, null);
 
-      this.batchStream = new BufferOutputStream();
-      this.batchEncoder = encoderFactory.binaryEncoder(stream, null);
-      this.batch = firstBatch;
+    this.batchStream = new BufferOutputStream();
+    this.batchEncoder = encoderFactory.binaryEncoder(stream, null);
+    this.batch = firstBatch;
 
     try {
 
-      this.avroSchema = ArrowToAvroUtils.createAvroSchema(
-          firstBatch.getSchema().getFields(),
-          dictionaries);
+      this.avroSchema =
+          ArrowToAvroUtils.createAvroSchema(firstBatch.getSchema().getFields(), dictionaries);
 
-      this.recordProducer = ArrowToAvroUtils.createCompositeProducer(
-          firstBatch.getFieldVectors(),
-          dictionaries);
+      this.recordProducer =
+          ArrowToAvroUtils.createCompositeProducer(firstBatch.getFieldVectors(), dictionaries);
 
       // Generate a random sync marker
       var random = new Random();
@@ -99,11 +91,10 @@ public AvroFileWriter(
 
       // Look up the compression codec
       this.avroCodec = AvroCompression.getAvroCodec(codecName);
-    }
-    catch (Throwable e) {
-        // Do not leak the batch buffer if there are problems during setup
-        batchStream.close();
-        throw e;
+    } catch (Throwable e) {
+      // Do not leak the batch buffer if there are problems during setup
+      batchStream.close();
+      throw e;
     }
   }