AWS, Core, Data, Spark: Remove deprecations for 1.11.0

.palantir/revapi.yml

@@ -1363,6 +1363,63 @@ acceptedBreaks:
       old: "method org.apache.iceberg.parquet.ParquetValueWriters.StructWriter<org.apache.iceberg.data.Record>\
         \ org.apache.iceberg.data.parquet.GenericParquetWriter::createStructWriter(java.util.List<org.apache.iceberg.parquet.ParquetValueWriter<?>>)"
       justification: "Removing deprecations for 1.10.0"
+  "1.10.0":
+    org.apache.iceberg:iceberg-core:
+      - code: "java.class.removed"
+        old: "class org.apache.iceberg.PartitionStatsUtil"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method java.lang.String org.apache.iceberg.RewriteTablePathUtil::stagingPath(java.lang.String,\
+        \ java.lang.String)"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.RewriteTablePathUtil.RewriteResult<org.apache.iceberg.DataFile>\
+        \ org.apache.iceberg.RewriteTablePathUtil::rewriteDataManifest(org.apache.iceberg.ManifestFile,\
+        \ org.apache.iceberg.io.OutputFile, org.apache.iceberg.io.FileIO, int, java.util.Map<java.lang.Integer,\
+        \ org.apache.iceberg.PartitionSpec>, java.lang.String, java.lang.String) throws\
+        \ java.io.IOException"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.RewriteTablePathUtil.RewriteResult<org.apache.iceberg.DeleteFile>\
+        \ org.apache.iceberg.RewriteTablePathUtil::rewriteDeleteManifest(org.apache.iceberg.ManifestFile,\
+        \ org.apache.iceberg.io.OutputFile, org.apache.iceberg.io.FileIO, int, java.util.Map<java.lang.Integer,\
+        \ org.apache.iceberg.PartitionSpec>, java.lang.String, java.lang.String, java.lang.String)\
+        \ throws java.io.IOException"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.Schema org.apache.iceberg.PartitionStatsHandler::schema(org.apache.iceberg.types.Types.StructType)"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.TableMetadata org.apache.iceberg.TableMetadataParser::read(org.apache.iceberg.io.FileIO,\
+        \ org.apache.iceberg.io.InputFile)"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.encryption.EncryptionManager org.apache.iceberg.encryption.EncryptionUtil::createEncryptionManager(java.util.Map<java.lang.String,\
+        \ java.lang.String>, org.apache.iceberg.encryption.KeyManagementClient)"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.rest.responses.OAuthTokenResponse org.apache.iceberg.rest.auth.OAuth2Util::exchangeToken(org.apache.iceberg.rest.RESTClient,\
+        \ java.util.Map<java.lang.String, java.lang.String>, java.lang.String, java.lang.String,\
+        \ java.lang.String, java.lang.String, java.lang.String)"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.rest.responses.OAuthTokenResponse org.apache.iceberg.rest.auth.OAuth2Util::exchangeToken(org.apache.iceberg.rest.RESTClient,\
+        \ java.util.Map<java.lang.String, java.lang.String>, java.lang.String, java.lang.String,\
+        \ java.lang.String, java.lang.String, java.lang.String, java.lang.String)"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.rest.responses.OAuthTokenResponse org.apache.iceberg.rest.auth.OAuth2Util::fetchToken(org.apache.iceberg.rest.RESTClient,\
+        \ java.util.Map<java.lang.String, java.lang.String>, java.lang.String, java.lang.String)"
+        justification: "Removing deprecated code for 1.11.0"
+      - code: "java.method.removed"
+        old: "method org.apache.iceberg.rest.responses.OAuthTokenResponse org.apache.iceberg.rest.auth.OAuth2Util::fetchToken(org.apache.iceberg.rest.RESTClient,\
+        \ java.util.Map<java.lang.String, java.lang.String>, java.lang.String, java.lang.String,\
+        \ java.lang.String)"
+        justification: "Removing deprecated code for 1.11.0"
+    org.apache.iceberg:iceberg-data:
+      - code: "java.class.removed"
+        old: "class org.apache.iceberg.data.PartitionStatsHandler"
+        justification: "Removing deprecated code for 1.11.0"
   apache-iceberg-0.14.0:
     org.apache.iceberg:iceberg-api:
     - code: "java.class.defaultSerializationChanged"

aws/src/main/java/org/apache/iceberg/aws/s3/S3FileIO.java

@@ -122,7 +122,7 @@ public S3FileIO() {}
    * @param s3 s3 supplier
    */
   public S3FileIO(SerializableSupplier<S3Client> s3) {
-    this(s3, null, new S3FileIOProperties());
+    this(s3, null);
   }
 
   /**
@@ -134,45 +134,10 @@ public S3FileIO(SerializableSupplier<S3Client> s3) {
    * @param s3Async s3Async supplier
    */
   public S3FileIO(SerializableSupplier<S3Client> s3, SerializableSupplier<S3AsyncClient> s3Async) {
-    this(s3, s3Async, new S3FileIOProperties());
-  }
-
-  /**
-   * Constructor with custom s3 supplier and S3FileIO properties.
-   *
-   * <p>Calling {@link S3FileIO#initialize(Map)} will overwrite information set in this constructor.
-   *
-   * @param s3 s3 supplier
-   * @param s3FileIOProperties S3 FileIO properties
-   * @deprecated since 1.10.0, will be removed in 1.11.0; use {@link
-   *     S3FileIO#S3FileIO(SerializableSupplier)} with {@link S3FileIO#initialize(Map)} instead
-   */
-  @Deprecated
-  public S3FileIO(SerializableSupplier<S3Client> s3, S3FileIOProperties s3FileIOProperties) {
-    this(s3, null, s3FileIOProperties);
-  }
-
-  /**
-   * Constructor with custom s3 supplier, s3Async supplier and S3FileIO properties.
-   *
-   * <p>Calling {@link S3FileIO#initialize(Map)} will overwrite information set in this constructor.
-   *
-   * @param s3 s3 supplier
-   * @param s3Async s3Async supplier
-   * @param s3FileIOProperties S3 FileIO properties
-   * @deprecated since 1.10.0, will be removed in 1.11.0; use {@link
-   *     S3FileIO#S3FileIO(SerializableSupplier, SerializableSupplier)} with {@link
-   *     S3FileIO#initialize(Map)} instead
-   */
-  @Deprecated
-  public S3FileIO(
-      SerializableSupplier<S3Client> s3,
-      SerializableSupplier<S3AsyncClient> s3Async,
-      S3FileIOProperties s3FileIOProperties) {
     this.s3 = s3;
     this.s3Async = s3Async;
     this.createStack = Thread.currentThread().getStackTrace();
-    this.properties = SerializableMap.copyOf(s3FileIOProperties.properties());
+    this.properties = SerializableMap.copyOf(Maps.newHashMap());
   }
 
   @Override

aws/src/main/java/org/apache/iceberg/aws/s3/S3InputFile.java

@@ -30,94 +30,6 @@ public class S3InputFile extends BaseS3File implements InputFile, NativelyEncryp
   private NativeFileCryptoParameters nativeDecryptionParameters;
   private Long length;
 
-  /**
-   * Creates a {@link S3InputFile} from the given parameters.
-   *
-   * @deprecated since 1.10.0, will be removed in 1.11.0; use {@link
-   *     S3InputFile#fromLocation(String, PrefixedS3Client, MetricsContext)} instead.
-   */
-  @Deprecated
-  public static S3InputFile fromLocation(
-      String location,
-      S3Client client,
-      S3FileIOProperties s3FileIOProperties,
-      MetricsContext metrics) {
-    return new S3InputFile(
-        client,
-        null,
-        new S3URI(location, s3FileIOProperties.bucketToAccessPointMapping()),
-        null,
-        s3FileIOProperties,
-        metrics);
-  }
-
-  /**
-   * Creates a {@link S3InputFile} from the given parameters.
-   *
-   * @deprecated since 1.10.0, will be removed in 1.11.0; use {@link
-   *     S3InputFile#fromLocation(String, PrefixedS3Client, MetricsContext)} instead.
-   */
-  @Deprecated
-  public static S3InputFile fromLocation(
-      String location,
-      S3Client client,
-      S3AsyncClient asyncClient,
-      S3FileIOProperties s3FileIOProperties,
-      MetricsContext metrics) {
-    return new S3InputFile(
-        client,
-        asyncClient,
-        new S3URI(location, s3FileIOProperties.bucketToAccessPointMapping()),
-        null,
-        s3FileIOProperties,
-        metrics);
-  }
-
-  /**
-   * Creates a {@link S3InputFile} from the given parameters.
-   *
-   * @deprecated since 1.10.0, will be removed in 1.11.0; use {@link
-   *     S3InputFile#fromLocation(String, long, PrefixedS3Client, MetricsContext)} instead.
-   */
-  @Deprecated
-  public static S3InputFile fromLocation(
-      String location,
-      long length,
-      S3Client client,
-      S3FileIOProperties s3FileIOProperties,
-      MetricsContext metrics) {
-    return new S3InputFile(
-        client,
-        null,
-        new S3URI(location, s3FileIOProperties.bucketToAccessPointMapping()),
-        length > 0 ? length : null,
-        s3FileIOProperties,
-        metrics);
-  }
-
-  /**
-   * Creates a {@link S3InputFile} from the given parameters.
-   *
-   * @deprecated since 1.10.0, will be removed in 1.11.0; use {@link
-   *     S3InputFile#fromLocation(String, long, PrefixedS3Client, MetricsContext)} instead.
-   */
-  @Deprecated
-  public static S3InputFile fromLocation(
-      String location,
-      long length,
-      S3Client client,
-      S3AsyncClient asyncClient,
-      S3FileIOProperties s3FileIOProperties,
-      MetricsContext metrics) {
-    return new S3InputFile(
-        client,
-        asyncClient,
-        new S3URI(location, s3FileIOProperties.bucketToAccessPointMapping()),
-        length > 0 ? length : null,
-        s3FileIOProperties,
-        metrics);
-  }
-
   static S3InputFile fromLocation(
       String location, PrefixedS3Client client, MetricsContext metrics) {
     return fromLocation(location, 0, client, metrics);

aws/src/main/java/org/apache/iceberg/aws/s3/S3OutputFile.java

@@ -33,47 +33,6 @@
 public class S3OutputFile extends BaseS3File implements OutputFile, NativelyEncryptedFile {
   private NativeFileCryptoParameters nativeEncryptionParameters;
 
-  /**
-   * Creates a {@link S3OutputFile} from the given parameters.
-   *
-   * @deprecated since 1.10.0, will be removed in 1.11.0; use {@link
-   *     S3OutputFile#fromLocation(String, PrefixedS3Client, MetricsContext)} instead.
-   */
-  @Deprecated
-  public static S3OutputFile fromLocation(
-      String location,
-      S3Client client,
-      S3FileIOProperties s3FileIOProperties,
-      MetricsContext metrics) {
-    return new S3OutputFile(
-        client,
-        null,
-        new S3URI(location, s3FileIOProperties.bucketToAccessPointMapping()),
-        s3FileIOProperties,
-        metrics);
-  }
-
-  /**
-   * Creates a {@link S3OutputFile} from the given parameters.
-   *
-   * @deprecated since 1.10.0, will be removed in 1.11.0; use {@link
-   *     S3OutputFile#fromLocation(String, PrefixedS3Client, MetricsContext)} instead.
-   */
-  @Deprecated
-  public static S3OutputFile fromLocation(
-      String location,
-      S3Client client,
-      S3AsyncClient asyncClient,
-      S3FileIOProperties s3FileIOProperties,
-      MetricsContext metrics) {
-    return new S3OutputFile(
-        client,
-        asyncClient,
-        new S3URI(location, s3FileIOProperties.bucketToAccessPointMapping()),
-        s3FileIOProperties,
-        metrics);
-  }
-
   static S3OutputFile fromLocation(
       String location, PrefixedS3Client client, MetricsContext metrics) {
     return new S3OutputFile(

core/src/main/java/org/apache/iceberg/PartitionStatsHandler.java

@@ -100,25 +100,6 @@ private PartitionStatsHandler() {}
           .withWriteDefault(Literal.of(0))
           .build();
 
-  /**
-   * Generates the partition stats file schema based on a combined partition type which considers
-   * all specs in a table.
-   *
-   * <p>Use this only for format version 1 and 2. For version 3 and above use {@link
-   * #schema(StructType, int)}
-   *
-   * @param unifiedPartitionType unified partition schema type. Could be calculated by {@link
-   *     Partitioning#partitionType(Table)}.
-   * @return a schema that corresponds to the provided unified partition type.
-   * @deprecated since 1.10.0, will be removed in 1.11.0. Use {@link #schema(StructType, int)}
-   *     instead.
-   */
-  @Deprecated
-  public static Schema schema(StructType unifiedPartitionType) {
-    Preconditions.checkState(!unifiedPartitionType.fields().isEmpty(), "Table must be partitioned");
-    return v2Schema(unifiedPartitionType);
-  }
-
   /**
    * Generates the partition stats file schema for a given format version based on a combined
    * partition type which considers all specs in a table.