Make the code a bit more pretty

Author: pvary

core/src/main/java/org/apache/iceberg/avro/Avro.java

@@ -36,13 +36,14 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Registry which maintains the available {@link ReadBuilder}s and {@link WriterService}
- * implementations. Based on the `file format`, the required `data type` and the reader/writer
- * `builderType` the registry returns the correct reader and writer service implementations. These
- * services could be used to generate the correct reader and writer builders.
+ * Registry which maintains the available {@link ReadBuilder}s and {@link WriteBuilder}s. Based on
+ * the `file format`, the required `data type` and the reader/writer `builderType` the registry
+ * returns the correct reader and writer builders. These services could be used to generate the
+ * correct readers and writers.
  */
 public final class DataFileServiceRegistry {
   private static final Logger LOG = LoggerFactory.getLogger(DataFileServiceRegistry.class);
+  // The list of classes which are used for registering the reader and writer builders
   private static final String[] CLASSES_TO_REGISTER =
       new String[] {
         "org.apache.iceberg.parquet.Parquet",
@@ -58,6 +59,7 @@ public final class DataFileServiceRegistry {
   private static final Map<Key, Function<InputFile, ReadBuilder<?, ?>>> READ_BUILDERS =
       Maps.newConcurrentMap();
 
+  /** Registers a new writer builder for the given format/input type. */
   public static void registerWrite(
       FileFormat format,
       String inputType,
@@ -73,11 +75,13 @@ public static void registerWrite(
     WRITE_BUILDERS.putIfAbsent(key, writeBuilder);
   }
 
+  /** Registers a new reader builder for the given format/input type. */
   public static void registerRead(
       FileFormat format, String outputType, Function<InputFile, ReadBuilder<?, ?>> readBuilder) {
     registerRead(format, outputType, null, readBuilder);
   }
 
+  /** Registers a new reader builder for the given format/input type/reader type. */
   public static void registerRead(
       FileFormat format,
       String outputType,
@@ -107,8 +111,10 @@ private static void registerSupportedFormats() {
         Record.class.getName(),
         outputFile ->
             new Avro.AvroDataWriteBuilder<Record, Schema>(outputFile)
-                .writerFunction((nativeType, schema) -> DataWriter.create(schema)));
+                .writerFunction((nativeType, schema) -> DataWriter.create(schema))
+                .positionDeleteWriterFunction((nativeType, schema) -> DataWriter.create(schema)));
 
+    // Uses dynamic methods to call the `register` for the listed classes
     for (String s : CLASSES_TO_REGISTER) {
       try {
         DynMethods.StaticMethod register =

core/src/main/java/org/apache/iceberg/io/datafile/DataFileServiceRegistry.java

@@ -29,7 +29,8 @@
  * Builder API for reading Iceberg data files.
  *
  * @param <D> The records returned by the reader
- * @param <F> The records accepted by the {@link DeleteFilter}
+ * @param <F> The records accepted by the {@link DeleteFilter}. Different from `D` for vectorized
+ *     readers.
  */
 public interface ReadBuilder<D, F> {
   /**
@@ -98,13 +99,16 @@ default ReadBuilder<D, F> withDeleteFilter(DeleteFilter<F> newDeleteFilter) {
   /** Sets a mapping from external schema names to Iceberg type IDs. */
   ReadBuilder<D, F> withNameMapping(NameMapping newNameMapping);
 
+  /** Sets the file encryption key used for reading the file. */
   default ReadBuilder<D, F> withFileEncryptionKey(ByteBuffer encryptionKey) {
     throw new UnsupportedOperationException("Not supported");
   }
 
+  /** Sets the additional authentication data prefix for encryption. */
   default ReadBuilder<D, F> withAADPrefix(ByteBuffer aadPrefix) {
     throw new UnsupportedOperationException("Not supported");
   }
 
+  /** Builds the reader. */
   CloseableIterable<D> build();
 }

core/src/main/java/org/apache/iceberg/io/datafile/ReadBuilder.java

@@ -47,11 +47,6 @@ public interface WriteBuilder<D, T> {
   /** Sets the file metadata kep/value pairs for the writer which should be written to the file. */
   WriteBuilder<D, T> meta(String property, String value);
 
-  default WriteBuilder<D, T> meta(Map<String, String> properties) {
-    properties.forEach(this::meta);
-    return this;
-  }
-
   /** Enables overwriting previously created files. */
   WriteBuilder<D, T> overwrite();
 
@@ -63,12 +58,16 @@ default WriteBuilder<D, T> meta(Map<String, String> properties) {
    */
   WriteBuilder<D, T> metricsConfig(MetricsConfig newMetricsConfig);
 
+  /** Sets the partition specification for the generated {@link org.apache.iceberg.ContentFile}. */
   WriteBuilder<D, T> withSpec(PartitionSpec newSpec);
 
+  /** Sets the partition value for the generated {@link org.apache.iceberg.ContentFile}. */
   WriteBuilder<D, T> withPartition(StructLike newPartition);
 
+  /** Sets the encryption key metadata for the generated {@link org.apache.iceberg.ContentFile}. */
   WriteBuilder<D, T> withKeyMetadata(EncryptionKeyMetadata metadata);
 
+  /** Sets the sort order for the generated {@link org.apache.iceberg.ContentFile}. */
   WriteBuilder<D, T> withSortOrder(SortOrder newSortOrder);
 
   /** The target data file schema. */
@@ -79,10 +78,12 @@ default WriteBuilder<D, T> meta(Map<String, String> properties) {
    */
   WriteBuilder<D, T> rowSchema(Schema schema);
 
+  /** Writes the file with the given encryption key */
   default WriteBuilder<D, T> withFileEncryptionKey(ByteBuffer fileEncryptionKey) {
     throw new UnsupportedOperationException("Not supported");
   }
 
+  /** Writes the AAP prefix to the the generated {@link org.apache.iceberg.ContentFile}. */
   default WriteBuilder<D, T> withAADPrefix(ByteBuffer aadPrefix) {
     throw new UnsupportedOperationException("Not supported");
   }
@@ -92,13 +93,21 @@ default WriteBuilder<D, T> withAADPrefix(ByteBuffer aadPrefix) {
   /** Sets the equality field ids which are used in the delete file. */
   WriteBuilder<D, T> equalityFieldIds(int... fieldIds);
 
+  /**
+   * Sets the engine specific data type for the writer. Used for conversion by the engine specific
+   * writers.
+   */
   WriteBuilder<D, T> nativeType(T nativeType);
 
-  FileAppender<D> appenderBuilder() throws IOException;
+  /** Creates an appender. */
+  FileAppender<D> appender() throws IOException;
 
-  DataWriter<D> writerBuilder() throws IOException;
+  /** Creates a data writer. */
+  DataWriter<D> dataWriter() throws IOException;
 
-  EqualityDeleteWriter<D> equalityWriterBuilder() throws IOException;
+  /** Creates an equality delete writer. */
+  EqualityDeleteWriter<D> equalityDeleteWriter() throws IOException;
 
-  PositionDeleteWriter<D> positionWriterBuilder() throws IOException;
+  /** Creates a position delete writer. */
+  PositionDeleteWriter<D> positionDeleteWriter() throws IOException;
 }

core/src/main/java/org/apache/iceberg/io/datafile/WriteBuilder.java

@@ -94,7 +94,7 @@ public FileAppender<Record> newAppender(
           .setAll(config)
           .metricsConfig(metricsConfig)
           .overwrite()
-          .appenderBuilder();
+          .appender();
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }
@@ -136,7 +136,7 @@ public EqualityDeleteWriter<Record> newEqDeleteWriter(
           .withSpec(spec)
           .withKeyMetadata(file.keyMetadata())
           .equalityFieldIds(equalityFieldIds)
-          .equalityWriterBuilder();
+          .equalityDeleteWriter();
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }
@@ -158,7 +158,7 @@ public PositionDeleteWriter<Record> newPosDeleteWriter(
           .rowSchema(posDeleteRowSchema)
           .withSpec(spec)
           .withKeyMetadata(file.keyMetadata())
-          .positionWriterBuilder();
+          .positionDeleteWriter();
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }

data/src/main/java/org/apache/iceberg/data/GenericAppenderFactory.java

@@ -28,9 +28,6 @@
 import org.apache.iceberg.SortOrder;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.avro.Avro;
-import org.apache.iceberg.data.avro.DataWriter;
-import org.apache.iceberg.data.orc.GenericOrcWriter;
-import org.apache.iceberg.data.parquet.GenericParquetWriter;
 import org.apache.iceberg.orc.ORC;
 import org.apache.iceberg.parquet.Parquet;
 import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
@@ -69,49 +66,40 @@ static Builder builderFor(Table table) {
     return new Builder(table);
   }
 
-  @Override
   protected void configureDataWrite(Avro.DataWriteBuilder builder) {
-    builder.createWriterFunc(DataWriter::create);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
-  @Override
   protected void configureEqualityDelete(Avro.DeleteWriteBuilder builder) {
-    builder.createWriterFunc(DataWriter::create);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
-  @Override
   protected void configurePositionDelete(Avro.DeleteWriteBuilder builder) {
-    builder.createWriterFunc(DataWriter::create);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
-  @Override
   protected void configureDataWrite(Parquet.DataWriteBuilder builder) {
-    builder.createWriterFunc(GenericParquetWriter::buildWriter);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
-  @Override
   protected void configureEqualityDelete(Parquet.DeleteWriteBuilder builder) {
-    builder.createWriterFunc(GenericParquetWriter::buildWriter);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
-  @Override
   protected void configurePositionDelete(Parquet.DeleteWriteBuilder builder) {
-    builder.createWriterFunc(GenericParquetWriter::buildWriter);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
-  @Override
   protected void configureDataWrite(ORC.DataWriteBuilder builder) {
-    builder.createWriterFunc(GenericOrcWriter::buildWriter);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
-  @Override
   protected void configureEqualityDelete(ORC.DeleteWriteBuilder builder) {
-    builder.createWriterFunc(GenericOrcWriter::buildWriter);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
-  @Override
   protected void configurePositionDelete(ORC.DeleteWriteBuilder builder) {
-    builder.createWriterFunc(GenericOrcWriter::buildWriter);
+    throw new UnsupportedOperationException("Deprecated");
   }
 
   static class Builder {

data/src/main/java/org/apache/iceberg/data/GenericFileWriterFactory.java

@@ -28,16 +28,13 @@
 import org.apache.iceberg.SortOrder;
 import org.apache.iceberg.StructLike;
 import org.apache.iceberg.Table;
-import org.apache.iceberg.avro.Avro;
 import org.apache.iceberg.deletes.EqualityDeleteWriter;
 import org.apache.iceberg.deletes.PositionDeleteWriter;
 import org.apache.iceberg.encryption.EncryptedOutputFile;
 import org.apache.iceberg.encryption.EncryptionKeyMetadata;
 import org.apache.iceberg.io.DataWriter;
 import org.apache.iceberg.io.FileWriterFactory;
 import org.apache.iceberg.io.datafile.DataFileServiceRegistry;
-import org.apache.iceberg.orc.ORC;
-import org.apache.iceberg.parquet.Parquet;
 import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
 
 /**
@@ -93,33 +90,6 @@ protected RegistryBasedFileWriterFactory(
     this.positionalDeleteSchemaType = positionalDeleteSchemaType;
   }
 
-  @Deprecated
-  protected abstract void configureDataWrite(Avro.DataWriteBuilder builder);
-
-  @Deprecated
-  protected abstract void configureEqualityDelete(Avro.DeleteWriteBuilder builder);
-
-  @Deprecated
-  protected abstract void configurePositionDelete(Avro.DeleteWriteBuilder builder);
-
-  @Deprecated
-  protected abstract void configureDataWrite(Parquet.DataWriteBuilder builder);
-
-  @Deprecated
-  protected abstract void configureEqualityDelete(Parquet.DeleteWriteBuilder builder);
-
-  @Deprecated
-  protected abstract void configurePositionDelete(Parquet.DeleteWriteBuilder builder);
-
-  @Deprecated
-  protected abstract void configureDataWrite(ORC.DataWriteBuilder builder);
-
-  @Deprecated
-  protected abstract void configureEqualityDelete(ORC.DeleteWriteBuilder builder);
-
-  @Deprecated
-  protected abstract void configurePositionDelete(ORC.DeleteWriteBuilder builder);
-
   protected S rowSchemaType() {
     return rowSchemaType;
   }
@@ -151,7 +121,7 @@ public DataWriter<T> newDataWriter(
           .withKeyMetadata(keyMetadata)
           .withSortOrder(dataSortOrder)
           .overwrite()
-          .writerBuilder();
+          .dataWriter();
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }
@@ -177,7 +147,7 @@ public EqualityDeleteWriter<T> newEqualityDeleteWriter(
           .withKeyMetadata(keyMetadata)
           .withSortOrder(equalityDeleteSortOrder)
           .overwrite()
-          .equalityWriterBuilder();
+          .equalityDeleteWriter();
     } catch (IOException e) {
       throw new UncheckedIOException("Failed to create new equality delete writer", e);
     }
@@ -201,7 +171,7 @@ public PositionDeleteWriter<T> newPositionDeleteWriter(
           .withPartition(partition)
           .withKeyMetadata(keyMetadata)
           .overwrite()
-          .positionWriterBuilder();
+          .positionDeleteWriter();
     } catch (IOException e) {
       throw new UncheckedIOException("Failed to create new position delete writer", e);
     }

data/src/main/java/org/apache/iceberg/data/RegistryBasedFileWriterFactory.java

@@ -145,7 +145,7 @@ public FileAppender<RowData> newAppender(OutputFile outputFile, FileFormat forma
           .schema(schema)
           .metricsConfig(metricsConfig)
           .overwrite()
-          .appenderBuilder();
+          .appender();
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }
@@ -186,7 +186,7 @@ public EqualityDeleteWriter<RowData> newEqDeleteWriter(
           .withSpec(spec)
           .withKeyMetadata(outputFile.keyMetadata())
           .equalityFieldIds(equalityFieldIds)
-          .equalityWriterBuilder();
+          .equalityDeleteWriter();
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }
@@ -207,7 +207,7 @@ public PositionDeleteWriter<RowData> newPosDeleteWriter(
           .rowSchema(posDeleteRowSchema)
           .withSpec(spec)
           .withKeyMetadata(outputFile.keyMetadata())
-          .positionWriterBuilder();
+          .positionDeleteWriter();
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }