Eduard's second batch of comments

Author: pvary

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

@@ -150,80 +150,80 @@ static Builder builderFor(Table table) {
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configureDataWrite(Avro.DataWriteBuilder builder) {
     builder.createWriterFunc(DataWriter::create);
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configureEqualityDelete(Avro.DeleteWriteBuilder builder) {
     builder.createWriterFunc(DataWriter::create);
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configurePositionDelete(Avro.DeleteWriteBuilder builder) {
     builder.createWriterFunc(DataWriter::create);
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configureDataWrite(Parquet.DataWriteBuilder builder) {
     builder.createWriterFunc(GenericParquetWriter::create);
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configureEqualityDelete(Parquet.DeleteWriteBuilder builder) {
     builder.createWriterFunc(GenericParquetWriter::create);
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configurePositionDelete(Parquet.DeleteWriteBuilder builder) {
     builder.createWriterFunc(GenericParquetWriter::create);
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configureDataWrite(ORC.DataWriteBuilder builder) {
     builder.createWriterFunc(GenericOrcWriter::buildWriter);
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configureEqualityDelete(ORC.DeleteWriteBuilder builder) {
     builder.createWriterFunc(GenericOrcWriter::buildWriter);
   }
 
   /**
-   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting 1.11.0 as the
-   *     configuration is done by the {@link FormatModelRegistry}.
+   * @deprecated Since 1.11.0, will be removed in 1.12.0. It won't be called starting in 1.11.0 as
+   *     the configuration is done by the {@link FormatModelRegistry}.
    */
   @Deprecated
   protected void configurePositionDelete(ORC.DeleteWriteBuilder builder) {
@@ -241,7 +241,7 @@ public PositionDeleteWriter<Record> newPositionDeleteWriter(
       MetricsConfig metricsConfig =
           table != null
               ? MetricsConfig.forPositionDelete(table)
-              : MetricsConfig.fromProperties(ImmutableMap.of());
+              : MetricsConfig.forPositionDelete();
 
       try {
         return switch (format) {

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

@@ -98,7 +98,7 @@ protected S equalityDeleteInputSchema() {
   @Override
   public DataWriter<T> newDataWriter(
       EncryptedOutputFile file, PartitionSpec spec, StructLike partition) {
-    Preconditions.checkNotNull(dataSchema, "Data schema must not be null");
+    Preconditions.checkArgument(dataSchema != null, "Invalid data schema: null");
     EncryptionKeyMetadata keyMetadata = file.keyMetadata();
     Map<String, String> properties = table != null ? table.properties() : ImmutableMap.of();
     MetricsConfig metricsConfig =
@@ -127,7 +127,7 @@ public DataWriter<T> newDataWriter(
   @Override
   public EqualityDeleteWriter<T> newEqualityDeleteWriter(
       EncryptedOutputFile file, PartitionSpec spec, StructLike partition) {
-    Preconditions.checkNotNull(equalityDeleteRowSchema, "Equality delete schema must not be null");
+    Preconditions.checkArgument(equalityDeleteRowSchema != null, "Invalid delete schema: null");
 
     EncryptionKeyMetadata keyMetadata = file.keyMetadata();
     Map<String, String> properties = table != null ? table.properties() : ImmutableMap.of();