This is an automated email from the ASF dual-hosted git repository.
etudenhoefner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 34cd01ba2e Build: Upgrade google-java-format to 1.22.0 (#11050)
34cd01ba2e is described below
commit 34cd01ba2e057866cdb13db8f9919bc98e11e638
Author: Manu Zhang <[email protected]>
AuthorDate: Wed Sep 11 18:08:49 2024 +0800
Build: Upgrade google-java-format to 1.22.0 (#11050)
---
api/src/main/java/org/apache/iceberg/DataFile.java | 5 ++++-
.../java/org/apache/iceberg/UpdatePartitionSpec.java | 2 +-
.../java/org/apache/iceberg/encryption/KmsClient.java | 4 +++-
.../java/org/apache/iceberg/transforms/Transforms.java | 4 +++-
.../java/org/apache/iceberg/transforms/Truncate.java | 4 +++-
api/src/test/java/org/apache/iceberg/TestHelpers.java | 1 +
.../java/org/apache/iceberg/aws/glue/GlueTestBase.java | 4 +---
.../iceberg/aws/glue/TestGlueCatalogCommitFailure.java | 3 ++-
.../apache/iceberg/aws/s3/TestS3FileIOIntegration.java | 6 ++----
.../org/apache/iceberg/aws/HttpClientProperties.java | 12 ++++++++++++
.../apache/iceberg/aws/s3/S3FileIOAwsClientFactory.java | 1 +
.../java/org/apache/iceberg/aws/s3/TestS3FileIO.java | 3 +--
baseline.gradle | 16 ++++------------
build.gradle | 2 +-
.../java/org/apache/iceberg/common/DynConstructors.java | 4 +++-
.../main/java/org/apache/iceberg/common/DynMethods.java | 4 +++-
.../main/java/org/apache/iceberg/CatalogProperties.java | 1 +
.../java/org/apache/iceberg/GenericManifestEntry.java | 12 +++++++++---
core/src/main/java/org/apache/iceberg/ManifestEntry.java | 1 +
.../java/org/apache/iceberg/ManifestFilterManager.java | 4 +++-
.../src/main/java/org/apache/iceberg/ManifestReader.java | 4 +++-
core/src/main/java/org/apache/iceberg/SystemConfigs.java | 4 +++-
.../main/java/org/apache/iceberg/TableProperties.java | 16 ++++++++++++----
.../org/apache/iceberg/TestMetadataTableFilters.java | 4 +++-
.../java/org/apache/iceberg/hadoop/HadoopFileIOTest.java | 6 ++----
.../apache/iceberg/dell/ecs/EcsSeekableInputStream.java | 1 +
.../java/org/apache/iceberg/flink/FlinkSchemaUtil.java | 4 +++-
.../flink/sink/shuffle/AggregatedStatisticsTracker.java | 4 +++-
.../flink/sink/shuffle/RequestGlobalStatisticsEvent.java | 4 +++-
.../org/apache/iceberg/flink/source/FlinkSource.java | 4 +++-
.../org/apache/iceberg/flink/source/IcebergSource.java | 4 +++-
.../source/enumerator/ContinuousIcebergEnumerator.java | 1 +
.../flink/sink/shuffle/TestMapRangePartitioner.java | 4 +++-
.../enumerator/TestContinuousSplitPlannerImpl.java | 4 +++-
.../java/org/apache/iceberg/flink/FlinkSchemaUtil.java | 4 +++-
.../flink/sink/shuffle/AggregatedStatisticsTracker.java | 4 +++-
.../flink/sink/shuffle/RequestGlobalStatisticsEvent.java | 4 +++-
.../org/apache/iceberg/flink/source/FlinkSource.java | 4 +++-
.../org/apache/iceberg/flink/source/IcebergSource.java | 4 +++-
.../source/enumerator/ContinuousIcebergEnumerator.java | 1 +
.../apache/iceberg/flink/sink/TestIcebergCommitter.java | 2 +-
.../flink/sink/shuffle/TestMapRangePartitioner.java | 4 +++-
.../enumerator/TestContinuousSplitPlannerImpl.java | 4 +++-
.../java/org/apache/iceberg/flink/FlinkSchemaUtil.java | 4 +++-
.../flink/sink/shuffle/AggregatedStatisticsTracker.java | 4 +++-
.../flink/sink/shuffle/RequestGlobalStatisticsEvent.java | 4 +++-
.../org/apache/iceberg/flink/source/FlinkSource.java | 4 +++-
.../org/apache/iceberg/flink/source/IcebergSource.java | 4 +++-
.../source/enumerator/ContinuousIcebergEnumerator.java | 1 +
.../apache/iceberg/flink/sink/TestIcebergCommitter.java | 2 +-
.../flink/sink/shuffle/TestMapRangePartitioner.java | 4 +++-
.../enumerator/TestContinuousSplitPlannerImpl.java | 4 +++-
.../main/java/org/apache/iceberg/gcp/GCPProperties.java | 1 +
.../java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java | 1 +
orc/src/main/java/org/apache/iceberg/orc/ORC.java | 4 +++-
.../main/java/org/apache/iceberg/orc/ORCSchemaUtil.java | 1 +
.../main/java/org/apache/iceberg/parquet/Parquet.java | 8 ++++++--
.../org/apache/iceberg/snowflake/SnowflakeCatalog.java | 1 +
.../spark/extensions/TestSnapshotTableProcedure.java | 1 +
.../spark/source/TestIcebergSourceTablesBase.java | 9 +++++++--
.../spark/extensions/TestSnapshotTableProcedure.java | 1 +
.../spark/source/TestIcebergSourceTablesBase.java | 9 +++++++--
.../spark/extensions/TestSnapshotTableProcedure.java | 1 +
.../spark/source/TestIcebergSourceTablesBase.java | 9 +++++++--
64 files changed, 188 insertions(+), 77 deletions(-)
diff --git a/api/src/main/java/org/apache/iceberg/DataFile.java
b/api/src/main/java/org/apache/iceberg/DataFile.java
index 59b329c500..02ad0aff31 100644
--- a/api/src/main/java/org/apache/iceberg/DataFile.java
+++ b/api/src/main/java/org/apache/iceberg/DataFile.java
@@ -102,6 +102,7 @@ public interface DataFile extends ContentFile<DataFile> {
int PARTITION_ID = 102;
String PARTITION_NAME = "partition";
String PARTITION_DOC = "Partition data tuple, schema based on the partition
spec";
+
// NEXT ID TO ASSIGN: 142
static StructType getType(StructType partitionType) {
@@ -126,7 +127,9 @@ public interface DataFile extends ContentFile<DataFile> {
SORT_ORDER_ID);
}
- /** @return the content stored in the file; one of DATA, POSITION_DELETES,
or EQUALITY_DELETES */
+ /**
+ * @return the content stored in the file; one of DATA, POSITION_DELETES, or
EQUALITY_DELETES
+ */
@Override
default FileContent content() {
return FileContent.DATA;
diff --git a/api/src/main/java/org/apache/iceberg/UpdatePartitionSpec.java
b/api/src/main/java/org/apache/iceberg/UpdatePartitionSpec.java
index eeb596d42d..a4994d2200 100644
--- a/api/src/main/java/org/apache/iceberg/UpdatePartitionSpec.java
+++ b/api/src/main/java/org/apache/iceberg/UpdatePartitionSpec.java
@@ -132,5 +132,5 @@ public interface UpdatePartitionSpec extends
PendingUpdate<PartitionSpec> {
default UpdatePartitionSpec addNonDefaultSpec() {
throw new UnsupportedOperationException(
this.getClass().getName() + " doesn't implement addNonDefaultSpec()");
- };
+ }
}
diff --git a/api/src/main/java/org/apache/iceberg/encryption/KmsClient.java
b/api/src/main/java/org/apache/iceberg/encryption/KmsClient.java
index 3ebda7be27..87dd2b286b 100644
--- a/api/src/main/java/org/apache/iceberg/encryption/KmsClient.java
+++ b/api/src/main/java/org/apache/iceberg/encryption/KmsClient.java
@@ -23,7 +23,9 @@ import java.nio.ByteBuffer;
import java.util.Map;
/** A minimum client interface to connect to a key management service (KMS). */
-/** @deprecated the API will be removed in v2.0.0 (replaced with
KeyManagementClient interface). */
+/**
+ * @deprecated the API will be removed in v2.0.0 (replaced with
KeyManagementClient interface).
+ */
@Deprecated
public interface KmsClient extends Serializable {
diff --git a/api/src/main/java/org/apache/iceberg/transforms/Transforms.java
b/api/src/main/java/org/apache/iceberg/transforms/Transforms.java
index 11282efdef..aacd4d4300 100644
--- a/api/src/main/java/org/apache/iceberg/transforms/Transforms.java
+++ b/api/src/main/java/org/apache/iceberg/transforms/Transforms.java
@@ -67,7 +67,9 @@ public class Transforms {
return new UnknownTransform<>(transform);
}
- /** @deprecated use {@link #identity()} instead; will be removed in 2.0.0 */
+ /**
+ * @deprecated use {@link #identity()} instead; will be removed in 2.0.0
+ */
@Deprecated
public static Transform<?, ?> fromString(Type type, String transform) {
Matcher widthMatcher = HAS_WIDTH.matcher(transform);
diff --git a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java
b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java
index 670c6002a9..a111e4ca39 100644
--- a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java
+++ b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java
@@ -43,7 +43,9 @@ class Truncate<T> implements Transform<T, T>, Function<T, T> {
return new Truncate<>(width);
}
- /** @deprecated will be removed in 2.0.0 */
+ /**
+ * @deprecated will be removed in 2.0.0
+ */
@Deprecated
@SuppressWarnings("unchecked")
static <T, R extends Truncate<T> & SerializableFunction<T, T>> R get(Type
type, int width) {
diff --git a/api/src/test/java/org/apache/iceberg/TestHelpers.java
b/api/src/test/java/org/apache/iceberg/TestHelpers.java
index 329a61fb44..ca3b1a908a 100644
--- a/api/src/test/java/org/apache/iceberg/TestHelpers.java
+++ b/api/src/test/java/org/apache/iceberg/TestHelpers.java
@@ -222,6 +222,7 @@ public class TestHelpers {
return obj;
}
}
+
/**
* Serializes an {@link Object} to a byte array for storage/serialization.
*
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/glue/GlueTestBase.java
b/aws/src/integration/java/org/apache/iceberg/aws/glue/GlueTestBase.java
index 495c5ca98e..29076369c8 100644
--- a/aws/src/integration/java/org/apache/iceberg/aws/glue/GlueTestBase.java
+++ b/aws/src/integration/java/org/apache/iceberg/aws/glue/GlueTestBase.java
@@ -181,9 +181,7 @@ public class GlueTestBase {
.owner(existingTable.owner())
.parameters(existingTable.parameters())
.storageDescriptor(
- existingTable
- .storageDescriptor()
- .toBuilder()
+ existingTable.storageDescriptor().toBuilder()
.columns(updatedColumns)
.build())
.build())
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogCommitFailure.java
b/aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogCommitFailure.java
index 42b527a037..a1df3d21da 100644
---
a/aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogCommitFailure.java
+++
b/aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogCommitFailure.java
@@ -531,7 +531,8 @@ public class TestGlueCatalogCommitFailure extends
GlueTestBase {
new
File(S3TestUtil.getKeyFromUri(metadata.metadataFileLocation()))
.getParent())
.build())
- .contents().stream()
+ .contents()
+ .stream()
.filter(s3Object -> s3Object.key().endsWith("metadata.json"))
.count();
}
diff --git
a/aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java
b/aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java
index b8b86fddc5..388260a546 100644
---
a/aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java
+++
b/aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java
@@ -459,8 +459,7 @@ public class TestS3FileIOIntegration {
List<Integer> scaleSizes = Lists.newArrayList(1, 1000, 2500);
String listPrefix = String.format("s3://%s/%s/%s", bucketName, prefix,
"prefix-list-test");
- scaleSizes
- .parallelStream()
+ scaleSizes.parallelStream()
.forEach(
scale -> {
String scalePrefix = String.format("%s/%s/", listPrefix, scale);
@@ -481,8 +480,7 @@ public class TestS3FileIOIntegration {
String deletePrefix = String.format("s3://%s/%s/%s", bucketName, prefix,
"prefix-delete-test");
List<Integer> scaleSizes = Lists.newArrayList(0, 5, 1000, 2500);
- scaleSizes
- .parallelStream()
+ scaleSizes.parallelStream()
.forEach(
scale -> {
String scalePrefix = String.format("%s/%s/", deletePrefix,
scale);
diff --git a/aws/src/main/java/org/apache/iceberg/aws/HttpClientProperties.java
b/aws/src/main/java/org/apache/iceberg/aws/HttpClientProperties.java
index 3e615cad70..438ae5bb04 100644
--- a/aws/src/main/java/org/apache/iceberg/aws/HttpClientProperties.java
+++ b/aws/src/main/java/org/apache/iceberg/aws/HttpClientProperties.java
@@ -44,6 +44,7 @@ public class HttpClientProperties implements Serializable {
public static final String CLIENT_TYPE_APACHE = "apache";
private static final String CLIENT_PREFIX = "http-client.";
+
/**
* If this is set under {@link #CLIENT_TYPE}, {@link
* software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient} will
be used as the HTTP
@@ -59,6 +60,7 @@ public class HttpClientProperties implements Serializable {
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}
*/
public static final String PROXY_ENDPOINT = "http-client.proxy-endpoint";
+
/**
* Used to configure the connection timeout in milliseconds for {@link
*
software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient.Builder}.
This flag only
@@ -69,6 +71,7 @@ public class HttpClientProperties implements Serializable {
*/
public static final String URLCONNECTION_CONNECTION_TIMEOUT_MS =
"http-client.urlconnection.connection-timeout-ms";
+
/**
* Used to configure the socket timeout in milliseconds for {@link
*
software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient.Builder}.
This flag only
@@ -79,6 +82,7 @@ public class HttpClientProperties implements Serializable {
*/
public static final String URLCONNECTION_SOCKET_TIMEOUT_MS =
"http-client.urlconnection.socket-timeout-ms";
+
/**
* Used to configure the connection timeout in milliseconds for {@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
@@ -89,6 +93,7 @@ public class HttpClientProperties implements Serializable {
*/
public static final String APACHE_CONNECTION_TIMEOUT_MS =
"http-client.apache.connection-timeout-ms";
+
/**
* Used to configure the socket timeout in milliseconds for {@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
@@ -98,6 +103,7 @@ public class HttpClientProperties implements Serializable {
*
https://sdk.amazonaws.com/java/api/latest/software/amazon/awssdk/http/apache/ApacheHttpClient.Builder.html
*/
public static final String APACHE_SOCKET_TIMEOUT_MS =
"http-client.apache.socket-timeout-ms";
+
/**
* Used to configure the connection acquisition timeout in milliseconds for
{@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
@@ -108,6 +114,7 @@ public class HttpClientProperties implements Serializable {
*/
public static final String APACHE_CONNECTION_ACQUISITION_TIMEOUT_MS =
"http-client.apache.connection-acquisition-timeout-ms";
+
/**
* Used to configure the connection max idle time in milliseconds for {@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
@@ -118,6 +125,7 @@ public class HttpClientProperties implements Serializable {
*/
public static final String APACHE_CONNECTION_MAX_IDLE_TIME_MS =
"http-client.apache.connection-max-idle-time-ms";
+
/**
* Used to configure the connection time to live in milliseconds for {@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
@@ -128,6 +136,7 @@ public class HttpClientProperties implements Serializable {
*/
public static final String APACHE_CONNECTION_TIME_TO_LIVE_MS =
"http-client.apache.connection-time-to-live-ms";
+
/**
* Used to configure whether to enable the expect continue setting for {@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
@@ -140,6 +149,7 @@ public class HttpClientProperties implements Serializable {
*/
public static final String APACHE_EXPECT_CONTINUE_ENABLED =
"http-client.apache.expect-continue-enabled";
+
/**
* Used to configure the max connections number for {@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
@@ -149,6 +159,7 @@ public class HttpClientProperties implements Serializable {
*
https://sdk.amazonaws.com/java/api/latest/software/amazon/awssdk/http/apache/ApacheHttpClient.Builder.html
*/
public static final String APACHE_MAX_CONNECTIONS =
"http-client.apache.max-connections";
+
/**
* Used to configure whether to enable the tcp keep alive setting for {@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
@@ -161,6 +172,7 @@ public class HttpClientProperties implements Serializable {
*/
public static final String APACHE_TCP_KEEP_ALIVE_ENABLED =
"http-client.apache.tcp-keep-alive-enabled";
+
/**
* Used to configure whether to use idle connection reaper for {@link
* software.amazon.awssdk.http.apache.ApacheHttpClient.Builder}. This flag
only works when {@link
diff --git
a/aws/src/main/java/org/apache/iceberg/aws/s3/S3FileIOAwsClientFactory.java
b/aws/src/main/java/org/apache/iceberg/aws/s3/S3FileIOAwsClientFactory.java
index 411e79f58f..718298818a 100644
--- a/aws/src/main/java/org/apache/iceberg/aws/s3/S3FileIOAwsClientFactory.java
+++ b/aws/src/main/java/org/apache/iceberg/aws/s3/S3FileIOAwsClientFactory.java
@@ -29,6 +29,7 @@ public interface S3FileIOAwsClientFactory extends
Serializable {
* @return s3 client
*/
S3Client s3();
+
/**
* Initialize AWS client factory from catalog properties.
*
diff --git a/aws/src/test/java/org/apache/iceberg/aws/s3/TestS3FileIO.java
b/aws/src/test/java/org/apache/iceberg/aws/s3/TestS3FileIO.java
index 1cc34a59cc..6caa42fb41 100644
--- a/aws/src/test/java/org/apache/iceberg/aws/s3/TestS3FileIO.java
+++ b/aws/src/test/java/org/apache/iceberg/aws/s3/TestS3FileIO.java
@@ -243,8 +243,7 @@ public class TestS3FileIO {
List<Integer> scaleSizes = Lists.newArrayList(1, 1000, 2500);
- scaleSizes
- .parallelStream()
+ scaleSizes.parallelStream()
.forEach(
scale -> {
String scalePrefix = String.format("%s/%s/", prefix, scale);
diff --git a/baseline.gradle b/baseline.gradle
index 5e2710be17..d29100aa3f 100644
--- a/baseline.gradle
+++ b/baseline.gradle
@@ -50,16 +50,7 @@ subprojects {
t.setDuplicatesStrategy(DuplicatesStrategy.WARN);
});
apply plugin: 'com.palantir.baseline-exact-dependencies'
- // We need to update Google Java Format to 1.17.0+ to run spotless on JDK 8,
but that requires dropping support for JDK 8.
- if (JavaVersion.current() == JavaVersion.VERSION_21) {
- task spotlessApply {
- doLast {
- throw new GradleException("Spotless plugin is currently disabled when
running on JDK 21 (until we drop JDK 8). To run spotlessApply please use a
different JDK version.")
- }
- }
- } else {
- apply plugin: 'com.diffplug.spotless'
- }
+ apply plugin: 'com.diffplug.spotless'
pluginManager.withPlugin('com.palantir.baseline-checkstyle') {
checkstyle {
@@ -74,8 +65,9 @@ subprojects {
spotless {
java {
target 'src/main/java/**/*.java', 'src/test/java/**/*.java',
'src/testFixtures/java/**/*.java', 'src/jmh/java/**/*.java',
'src/integration/java/**/*.java'
- // we use an older version of google-java-format that is compatible
with JDK 8
- googleJavaFormat("1.7")
+ // 1.23.0 has an issue in formatting comments
https://github.com/google/google-java-format/issues/1155
+ // so we stick to 1.22.0 to produce consistent result for JDK 11/17/21
+ googleJavaFormat("1.22.0")
removeUnusedImports()
licenseHeaderFile
"$rootDir/.baseline/copyright/copyright-header-java.txt"
}
diff --git a/build.gradle b/build.gradle
index fab949bf06..02758e2a79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
dependencies {
classpath 'io.github.goooler.shadow:shadow-gradle-plugin:8.1.8'
classpath 'com.palantir.baseline:gradle-baseline-java:5.61.0'
- classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.13.0'
+ classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.2'
classpath 'gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6'
diff --git
a/common/src/main/java/org/apache/iceberg/common/DynConstructors.java
b/common/src/main/java/org/apache/iceberg/common/DynConstructors.java
index 7ec8716c86..ea2fca931f 100644
--- a/common/src/main/java/org/apache/iceberg/common/DynConstructors.java
+++ b/common/src/main/java/org/apache/iceberg/common/DynConstructors.java
@@ -76,7 +76,9 @@ public class DynConstructors {
return (R) newInstance(args);
}
- /** @deprecated since 1.7.0, visibility will be reduced in 1.8.0 */
+ /**
+ * @deprecated since 1.7.0, visibility will be reduced in 1.8.0
+ */
@Deprecated // will become package-private
@Override
@SuppressWarnings("unchecked")
diff --git a/common/src/main/java/org/apache/iceberg/common/DynMethods.java
b/common/src/main/java/org/apache/iceberg/common/DynMethods.java
index 65a69bd0e1..5972cdf8dc 100644
--- a/common/src/main/java/org/apache/iceberg/common/DynMethods.java
+++ b/common/src/main/java/org/apache/iceberg/common/DynMethods.java
@@ -125,7 +125,9 @@ public class DynMethods {
/** Singleton {@link UnboundMethod}, performs no operation and returns
null. */
private static final UnboundMethod NOOP =
new UnboundMethod(null, "NOOP") {
- /** @deprecated since 1.7.0, visibility will be reduced in 1.8.0 */
+ /**
+ * @deprecated since 1.7.0, visibility will be reduced in 1.8.0
+ */
@Deprecated // will become package-private
@Override
public <R> R invokeChecked(Object target, Object... args) {
diff --git a/core/src/main/java/org/apache/iceberg/CatalogProperties.java
b/core/src/main/java/org/apache/iceberg/CatalogProperties.java
index b6fd990f0a..339c59b45d 100644
--- a/core/src/main/java/org/apache/iceberg/CatalogProperties.java
+++ b/core/src/main/java/org/apache/iceberg/CatalogProperties.java
@@ -124,6 +124,7 @@ public class CatalogProperties {
"client.pool.cache.eviction-interval-ms";
public static final long CLIENT_POOL_CACHE_EVICTION_INTERVAL_MS_DEFAULT =
TimeUnit.MINUTES.toMillis(5);
+
/**
* A comma separated list of elements used, in addition to the {@link #URI},
to compose the key of
* the client pool cache.
diff --git a/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java
b/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java
index 959e2446c7..575ea1f1c5 100644
--- a/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java
+++ b/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java
@@ -94,13 +94,17 @@ class GenericManifestEntry<F extends ContentFile<F>>
return this;
}
- /** @return the status of the file, whether EXISTING, ADDED, or DELETED */
+ /**
+ * @return the status of the file, whether EXISTING, ADDED, or DELETED
+ */
@Override
public Status status() {
return status;
}
- /** @return id of the snapshot in which the file was added to the table */
+ /**
+ * @return id of the snapshot in which the file was added to the table
+ */
@Override
public Long snapshotId() {
return snapshotId;
@@ -116,7 +120,9 @@ class GenericManifestEntry<F extends ContentFile<F>>
return fileSequenceNumber;
}
- /** @return a file */
+ /**
+ * @return a file
+ */
@Override
public F file() {
return file;
diff --git a/core/src/main/java/org/apache/iceberg/ManifestEntry.java
b/core/src/main/java/org/apache/iceberg/ManifestEntry.java
index 3eeb5407ab..4dce92cf5c 100644
--- a/core/src/main/java/org/apache/iceberg/ManifestEntry.java
+++ b/core/src/main/java/org/apache/iceberg/ManifestEntry.java
@@ -48,6 +48,7 @@ interface ManifestEntry<F extends ContentFile<F>> {
Types.NestedField FILE_SEQUENCE_NUMBER =
optional(4, "file_sequence_number", Types.LongType.get());
int DATA_FILE_ID = 2;
+
// next ID to assign: 5
static Schema getSchema(StructType partitionType) {
diff --git a/core/src/main/java/org/apache/iceberg/ManifestFilterManager.java
b/core/src/main/java/org/apache/iceberg/ManifestFilterManager.java
index 3b4c5e57e3..106be74fa3 100644
--- a/core/src/main/java/org/apache/iceberg/ManifestFilterManager.java
+++ b/core/src/main/java/org/apache/iceberg/ManifestFilterManager.java
@@ -289,7 +289,9 @@ abstract class ManifestFilterManager<F extends
ContentFile<F>> {
cleanUncommitted(SnapshotProducer.EMPTY_SET);
}
- /** @return a ManifestReader that is a filtered version of the input
manifest. */
+ /**
+ * @return a ManifestReader that is a filtered version of the input manifest.
+ */
private ManifestFile filterManifest(Schema tableSchema, ManifestFile
manifest) {
ManifestFile cached = filteredManifests.get(manifest);
if (cached != null) {
diff --git a/core/src/main/java/org/apache/iceberg/ManifestReader.java
b/core/src/main/java/org/apache/iceberg/ManifestReader.java
index b5f85813dd..6364603c59 100644
--- a/core/src/main/java/org/apache/iceberg/ManifestReader.java
+++ b/core/src/main/java/org/apache/iceberg/ManifestReader.java
@@ -292,7 +292,9 @@ public class ManifestReader<F extends ContentFile<F>>
extends CloseableGroup
return entry != null && entry.status() != ManifestEntry.Status.DELETED;
}
- /** @return an Iterator of DataFile. Makes defensive copies of files before
returning */
+ /**
+ * @return an Iterator of DataFile. Makes defensive copies of files before
returning
+ */
@Override
public CloseableIterator<F> iterator() {
boolean dropStats = dropStats(columns);
diff --git a/core/src/main/java/org/apache/iceberg/SystemConfigs.java
b/core/src/main/java/org/apache/iceberg/SystemConfigs.java
index 9cb345b444..6dd4471752 100644
--- a/core/src/main/java/org/apache/iceberg/SystemConfigs.java
+++ b/core/src/main/java/org/apache/iceberg/SystemConfigs.java
@@ -72,7 +72,9 @@ public class SystemConfigs {
8,
Integer::parseUnsignedInt);
- /** @deprecated will be removed in 2.0.0; use name mapping instead */
+ /**
+ * @deprecated will be removed in 2.0.0; use name mapping instead
+ */
@Deprecated
public static final ConfigEntry<Boolean>
NETFLIX_UNSAFE_PARQUET_ID_FALLBACK_ENABLED =
new ConfigEntry<>(
diff --git a/core/src/main/java/org/apache/iceberg/TableProperties.java
b/core/src/main/java/org/apache/iceberg/TableProperties.java
index e412300816..1652e9312f 100644
--- a/core/src/main/java/org/apache/iceberg/TableProperties.java
+++ b/core/src/main/java/org/apache/iceberg/TableProperties.java
@@ -244,12 +244,16 @@ public class TableProperties {
public static final String OBJECT_STORE_ENABLED =
"write.object-storage.enabled";
public static final boolean OBJECT_STORE_ENABLED_DEFAULT = false;
- /** @deprecated Use {@link #WRITE_DATA_LOCATION} instead. */
+ /**
+ * @deprecated Use {@link #WRITE_DATA_LOCATION} instead.
+ */
@Deprecated public static final String OBJECT_STORE_PATH =
"write.object-storage.path";
public static final String WRITE_LOCATION_PROVIDER_IMPL =
"write.location-provider.impl";
- /** @deprecated Use {@link #WRITE_DATA_LOCATION} instead. */
+ /**
+ * @deprecated Use {@link #WRITE_DATA_LOCATION} instead.
+ */
@Deprecated
public static final String WRITE_FOLDER_STORAGE_LOCATION =
"write.folder-storage.path";
@@ -266,10 +270,14 @@ public class TableProperties {
public static final String WRITE_PARTITION_SUMMARY_LIMIT =
"write.summary.partition-limit";
public static final int WRITE_PARTITION_SUMMARY_LIMIT_DEFAULT = 0;
- /** @deprecated will be removed in 2.0.0, writing manifest lists is always
enabled */
+ /**
+ * @deprecated will be removed in 2.0.0, writing manifest lists is always
enabled
+ */
@Deprecated public static final String MANIFEST_LISTS_ENABLED =
"write.manifest-lists.enabled";
- /** @deprecated will be removed in 2.0.0, writing manifest lists is always
enabled */
+ /**
+ * @deprecated will be removed in 2.0.0, writing manifest lists is always
enabled
+ */
@Deprecated public static final boolean MANIFEST_LISTS_ENABLED_DEFAULT =
true;
public static final String METADATA_COMPRESSION =
"write.metadata.compression-codec";
diff --git
a/core/src/test/java/org/apache/iceberg/TestMetadataTableFilters.java
b/core/src/test/java/org/apache/iceberg/TestMetadataTableFilters.java
index bf6456e85a..f8c3401987 100644
--- a/core/src/test/java/org/apache/iceberg/TestMetadataTableFilters.java
+++ b/core/src/test/java/org/apache/iceberg/TestMetadataTableFilters.java
@@ -169,7 +169,9 @@ public class TestMetadataTableFilters extends TestBase {
}
}
- /** @return a basic expression that always evaluates to true, to test AND
logic */
+ /**
+ * @return a basic expression that always evaluates to true, to test AND
logic
+ */
private Expression dummyExpression() {
switch (type) {
case FILES:
diff --git a/core/src/test/java/org/apache/iceberg/hadoop/HadoopFileIOTest.java
b/core/src/test/java/org/apache/iceberg/hadoop/HadoopFileIOTest.java
index 109c88daea..1abbd94839 100644
--- a/core/src/test/java/org/apache/iceberg/hadoop/HadoopFileIOTest.java
+++ b/core/src/test/java/org/apache/iceberg/hadoop/HadoopFileIOTest.java
@@ -66,8 +66,7 @@ public class HadoopFileIOTest {
List<Integer> scaleSizes = Lists.newArrayList(1, 1000, 2500);
- scaleSizes
- .parallelStream()
+ scaleSizes.parallelStream()
.forEach(
scale -> {
Path scalePath = new Path(parent, Integer.toString(scale));
@@ -101,8 +100,7 @@ public class HadoopFileIOTest {
List<Integer> scaleSizes = Lists.newArrayList(1, 1000, 2500);
- scaleSizes
- .parallelStream()
+ scaleSizes.parallelStream()
.forEach(
scale -> {
Path scalePath = new Path(parent, Integer.toString(scale));
diff --git
a/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsSeekableInputStream.java
b/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsSeekableInputStream.java
index e59b03ae44..6d32d3ba98 100644
--- a/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsSeekableInputStream.java
+++ b/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsSeekableInputStream.java
@@ -46,6 +46,7 @@ class EcsSeekableInputStream extends SeekableInputStream {
/** Mutable pos set by {@link #seek(long)} */
private long newPos = 0;
+
/** Current pos of object content */
private long pos = -1;
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
index 4790dc85bf..afc09a719f 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
@@ -58,7 +58,9 @@ public class FlinkSchemaUtil {
private FlinkSchemaUtil() {}
- /** @deprecated Use {@link #convert(ResolvedSchema)} instead. */
+ /**
+ * @deprecated Use {@link #convert(ResolvedSchema)} instead.
+ */
@Deprecated
public static Schema convert(TableSchema schema) {
LogicalType schemaType = schema.toRowDataType().getLogicalType();
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
index 5525f02c87..95c2328f03 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
@@ -186,7 +186,9 @@ class AggregatedStatisticsTracker {
return subtaskSet.size() == parallelism;
}
- /** @return false if duplicate */
+ /**
+ * @return false if duplicate
+ */
private boolean merge(int subtask, DataStatistics taskStatistics) {
if (subtaskSet.contains(subtask)) {
return false;
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
index ce17e19643..ce94bec148 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
@@ -27,7 +27,9 @@ class RequestGlobalStatisticsEvent implements OperatorEvent {
this.signature = null;
}
- /** @param signature hashCode of the subtask's existing global statistics */
+ /**
+ * @param signature hashCode of the subtask's existing global statistics
+ */
RequestGlobalStatisticsEvent(int signature) {
this.signature = signature;
}
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
index b1431a32dd..228df74412 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
@@ -124,7 +124,9 @@ public class FlinkSource {
return this;
}
- /** @deprecated Use {@link #setAll} instead. */
+ /**
+ * @deprecated Use {@link #setAll} instead.
+ */
@Deprecated
public Builder properties(Map<String, String> properties) {
readOptions.putAll(properties);
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
index 5718f4b938..294ca2f55b 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
@@ -547,7 +547,9 @@ public class IcebergSource<T> implements Source<T,
IcebergSourceSplit, IcebergEn
return this;
}
- /** @deprecated Use {@link #setAll} instead. */
+ /**
+ * @deprecated Use {@link #setAll} instead.
+ */
@Deprecated
public Builder<T> properties(Map<String, String> properties) {
readOptions.putAll(properties);
diff --git
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
index c7021b9c68..c50c3854ee 100644
---
a/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
+++
b/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
public class ContinuousIcebergEnumerator extends AbstractIcebergEnumerator {
private static final Logger LOG =
LoggerFactory.getLogger(ContinuousIcebergEnumerator.class);
+
/**
* This is hardcoded, as {@link ScanContext#maxPlanningSnapshotCount()}
could be the knob to
* control the total number of snapshots worth of splits tracked by assigner.
diff --git
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
index d5a0bebc74..c95a9955b1 100644
---
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
+++
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
@@ -380,7 +380,9 @@ public class TestMapRangePartitioner {
return partitionResults;
}
- /** @param expectedAssignmentInfo excluding closing cost */
+ /**
+ * @param expectedAssignmentInfo excluding closing cost
+ */
private void validatePartitionResults(
Map<Integer, Pair<Long, Integer>> expectedAssignmentInfo,
Map<Integer, Pair<AtomicLong, Set<RowData>>> partitionResults,
diff --git
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
index 0690b456e0..5767fa02c8 100644
---
a/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
+++
b/flink/v1.18/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
@@ -80,7 +80,9 @@ public class TestContinuousSplitPlannerImpl {
snapshot2 = TABLE_RESOURCE.table().currentSnapshot();
}
- /** @return the last enumerated snapshot id */
+ /**
+ * @return the last enumerated snapshot id
+ */
private CycleResult verifyOneCycle(
ContinuousSplitPlannerImpl splitPlanner, IcebergEnumeratorPosition
lastPosition)
throws Exception {
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
index 4790dc85bf..afc09a719f 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
@@ -58,7 +58,9 @@ public class FlinkSchemaUtil {
private FlinkSchemaUtil() {}
- /** @deprecated Use {@link #convert(ResolvedSchema)} instead. */
+ /**
+ * @deprecated Use {@link #convert(ResolvedSchema)} instead.
+ */
@Deprecated
public static Schema convert(TableSchema schema) {
LogicalType schemaType = schema.toRowDataType().getLogicalType();
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
index 5525f02c87..95c2328f03 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
@@ -186,7 +186,9 @@ class AggregatedStatisticsTracker {
return subtaskSet.size() == parallelism;
}
- /** @return false if duplicate */
+ /**
+ * @return false if duplicate
+ */
private boolean merge(int subtask, DataStatistics taskStatistics) {
if (subtaskSet.contains(subtask)) {
return false;
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
index ce17e19643..ce94bec148 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
@@ -27,7 +27,9 @@ class RequestGlobalStatisticsEvent implements OperatorEvent {
this.signature = null;
}
- /** @param signature hashCode of the subtask's existing global statistics */
+ /**
+ * @param signature hashCode of the subtask's existing global statistics
+ */
RequestGlobalStatisticsEvent(int signature) {
this.signature = signature;
}
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
index b1431a32dd..228df74412 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
@@ -124,7 +124,9 @@ public class FlinkSource {
return this;
}
- /** @deprecated Use {@link #setAll} instead. */
+ /**
+ * @deprecated Use {@link #setAll} instead.
+ */
@Deprecated
public Builder properties(Map<String, String> properties) {
readOptions.putAll(properties);
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
index 5718f4b938..294ca2f55b 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
@@ -547,7 +547,9 @@ public class IcebergSource<T> implements Source<T,
IcebergSourceSplit, IcebergEn
return this;
}
- /** @deprecated Use {@link #setAll} instead. */
+ /**
+ * @deprecated Use {@link #setAll} instead.
+ */
@Deprecated
public Builder<T> properties(Map<String, String> properties) {
readOptions.putAll(properties);
diff --git
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
index c7021b9c68..c50c3854ee 100644
---
a/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
+++
b/flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
public class ContinuousIcebergEnumerator extends AbstractIcebergEnumerator {
private static final Logger LOG =
LoggerFactory.getLogger(ContinuousIcebergEnumerator.class);
+
/**
* This is hardcoded, as {@link ScanContext#maxPlanningSnapshotCount()}
could be the knob to
* control the total number of snapshots worth of splits tracked by assigner.
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergCommitter.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergCommitter.java
index abdb2b5c79..f11aae1d69 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergCommitter.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergCommitter.java
@@ -1441,5 +1441,5 @@ class TestIcebergCommitter extends TestBase {
public TypeSerializerSnapshot<CommittableMessage<IcebergCommittable>>
snapshotConfiguration() {
return null;
}
- };
+ }
}
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
index d5a0bebc74..c95a9955b1 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
@@ -380,7 +380,9 @@ public class TestMapRangePartitioner {
return partitionResults;
}
- /** @param expectedAssignmentInfo excluding closing cost */
+ /**
+ * @param expectedAssignmentInfo excluding closing cost
+ */
private void validatePartitionResults(
Map<Integer, Pair<Long, Integer>> expectedAssignmentInfo,
Map<Integer, Pair<AtomicLong, Set<RowData>>> partitionResults,
diff --git
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
index 0690b456e0..5767fa02c8 100644
---
a/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
+++
b/flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
@@ -80,7 +80,9 @@ public class TestContinuousSplitPlannerImpl {
snapshot2 = TABLE_RESOURCE.table().currentSnapshot();
}
- /** @return the last enumerated snapshot id */
+ /**
+ * @return the last enumerated snapshot id
+ */
private CycleResult verifyOneCycle(
ContinuousSplitPlannerImpl splitPlanner, IcebergEnumeratorPosition
lastPosition)
throws Exception {
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
index 4790dc85bf..afc09a719f 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/FlinkSchemaUtil.java
@@ -58,7 +58,9 @@ public class FlinkSchemaUtil {
private FlinkSchemaUtil() {}
- /** @deprecated Use {@link #convert(ResolvedSchema)} instead. */
+ /**
+ * @deprecated Use {@link #convert(ResolvedSchema)} instead.
+ */
@Deprecated
public static Schema convert(TableSchema schema) {
LogicalType schemaType = schema.toRowDataType().getLogicalType();
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
index 5525f02c87..95c2328f03 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/AggregatedStatisticsTracker.java
@@ -186,7 +186,9 @@ class AggregatedStatisticsTracker {
return subtaskSet.size() == parallelism;
}
- /** @return false if duplicate */
+ /**
+ * @return false if duplicate
+ */
private boolean merge(int subtask, DataStatistics taskStatistics) {
if (subtaskSet.contains(subtask)) {
return false;
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
index ce17e19643..ce94bec148 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink/shuffle/RequestGlobalStatisticsEvent.java
@@ -27,7 +27,9 @@ class RequestGlobalStatisticsEvent implements OperatorEvent {
this.signature = null;
}
- /** @param signature hashCode of the subtask's existing global statistics */
+ /**
+ * @param signature hashCode of the subtask's existing global statistics
+ */
RequestGlobalStatisticsEvent(int signature) {
this.signature = signature;
}
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
index b1431a32dd..228df74412 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/FlinkSource.java
@@ -124,7 +124,9 @@ public class FlinkSource {
return this;
}
- /** @deprecated Use {@link #setAll} instead. */
+ /**
+ * @deprecated Use {@link #setAll} instead.
+ */
@Deprecated
public Builder properties(Map<String, String> properties) {
readOptions.putAll(properties);
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
index 5718f4b938..294ca2f55b 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/IcebergSource.java
@@ -547,7 +547,9 @@ public class IcebergSource<T> implements Source<T,
IcebergSourceSplit, IcebergEn
return this;
}
- /** @deprecated Use {@link #setAll} instead. */
+ /**
+ * @deprecated Use {@link #setAll} instead.
+ */
@Deprecated
public Builder<T> properties(Map<String, String> properties) {
readOptions.putAll(properties);
diff --git
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
index c7021b9c68..c50c3854ee 100644
---
a/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
+++
b/flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/enumerator/ContinuousIcebergEnumerator.java
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
public class ContinuousIcebergEnumerator extends AbstractIcebergEnumerator {
private static final Logger LOG =
LoggerFactory.getLogger(ContinuousIcebergEnumerator.class);
+
/**
* This is hardcoded, as {@link ScanContext#maxPlanningSnapshotCount()}
could be the knob to
* control the total number of snapshots worth of splits tracked by assigner.
diff --git
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergCommitter.java
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergCommitter.java
index abdb2b5c79..f11aae1d69 100644
---
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergCommitter.java
+++
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/TestIcebergCommitter.java
@@ -1441,5 +1441,5 @@ class TestIcebergCommitter extends TestBase {
public TypeSerializerSnapshot<CommittableMessage<IcebergCommittable>>
snapshotConfiguration() {
return null;
}
- };
+ }
}
diff --git
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
index d5a0bebc74..c95a9955b1 100644
---
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
+++
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/shuffle/TestMapRangePartitioner.java
@@ -380,7 +380,9 @@ public class TestMapRangePartitioner {
return partitionResults;
}
- /** @param expectedAssignmentInfo excluding closing cost */
+ /**
+ * @param expectedAssignmentInfo excluding closing cost
+ */
private void validatePartitionResults(
Map<Integer, Pair<Long, Integer>> expectedAssignmentInfo,
Map<Integer, Pair<AtomicLong, Set<RowData>>> partitionResults,
diff --git
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
index 0690b456e0..5767fa02c8 100644
---
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
+++
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/enumerator/TestContinuousSplitPlannerImpl.java
@@ -80,7 +80,9 @@ public class TestContinuousSplitPlannerImpl {
snapshot2 = TABLE_RESOURCE.table().currentSnapshot();
}
- /** @return the last enumerated snapshot id */
+ /**
+ * @return the last enumerated snapshot id
+ */
private CycleResult verifyOneCycle(
ContinuousSplitPlannerImpl splitPlanner, IcebergEnumeratorPosition
lastPosition)
throws Exception {
diff --git a/gcp/src/main/java/org/apache/iceberg/gcp/GCPProperties.java
b/gcp/src/main/java/org/apache/iceberg/gcp/GCPProperties.java
index 4465ee2901..4f60e2f91f 100644
--- a/gcp/src/main/java/org/apache/iceberg/gcp/GCPProperties.java
+++ b/gcp/src/main/java/org/apache/iceberg/gcp/GCPProperties.java
@@ -46,6 +46,7 @@ public class GCPProperties implements Serializable {
/** Configure the batch size used when deleting multiple files from a given
GCS bucket */
public static final String GCS_DELETE_BATCH_SIZE = "gcs.delete.batch-size";
+
/**
* Max possible batch size for deletion. Currently, a max of 100 keys is
advised, so we default to
* a number below that. https://cloud.google.com/storage/docs/batch
diff --git a/hive3/src/main/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java
b/hive3/src/main/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java
index 4f2cdf0282..4031bfaa20 100644
--- a/hive3/src/main/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java
+++ b/hive3/src/main/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java
@@ -51,6 +51,7 @@ public class OrcSplit extends FileSplit implements
ColumnarSplit, LlapAwareSplit
private static final Logger LOG = LoggerFactory.getLogger(OrcSplit.class);
private OrcTail orcTail;
private boolean hasFooter;
+
/** This means {@link AcidUtils.AcidBaseFileType#ORIGINAL_BASE} */
private boolean isOriginal;
diff --git a/orc/src/main/java/org/apache/iceberg/orc/ORC.java
b/orc/src/main/java/org/apache/iceberg/orc/ORC.java
index 18186fe3f2..451c670fcd 100644
--- a/orc/src/main/java/org/apache/iceberg/orc/ORC.java
+++ b/orc/src/main/java/org/apache/iceberg/orc/ORC.java
@@ -95,7 +95,9 @@ import
org.apache.orc.storage.ql.exec.vector.VectorizedRowBatch;
@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class ORC {
- /** @deprecated use {@link TableProperties#ORC_WRITE_BATCH_SIZE} instead */
+ /**
+ * @deprecated use {@link TableProperties#ORC_WRITE_BATCH_SIZE} instead
+ */
@Deprecated private static final String VECTOR_ROW_BATCH_SIZE =
"iceberg.orc.vectorbatch.size";
private ORC() {}
diff --git a/orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java
b/orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java
index ba6d6eedd1..a573d68748 100644
--- a/orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java
+++ b/orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java
@@ -73,6 +73,7 @@ public final class ORCSchemaUtil {
* to an ORC binary type. The values for this attribute are denoted in
{@code BinaryType}.
*/
public static final String ICEBERG_BINARY_TYPE_ATTRIBUTE =
"iceberg.binary-type";
+
/**
* The name of the ORC {@link TypeDescription} attribute indicating the
Iceberg type corresponding
* to an ORC long type. The values for this attribute are denoted in {@code
LongType}.
diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java
b/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java
index 3421c0b86d..a3a5931832 100644
--- a/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java
+++ b/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java
@@ -1090,7 +1090,9 @@ public class Parquet {
return this;
}
- /** @deprecated will be removed in 2.0.0; use {@link
#createReaderFunc(Function)} instead */
+ /**
+ * @deprecated will be removed in 2.0.0; use {@link
#createReaderFunc(Function)} instead
+ */
@Deprecated
public ReadBuilder readSupport(ReadSupport<?> newFilterSupport) {
this.readSupport = newFilterSupport;
@@ -1119,7 +1121,9 @@ public class Parquet {
return this;
}
- /** @deprecated will be removed in 2.0.0; use {@link
#createReaderFunc(Function)} instead */
+ /**
+ * @deprecated will be removed in 2.0.0; use {@link
#createReaderFunc(Function)} instead
+ */
@Deprecated
public ReadBuilder callInit() {
this.callInit = true;
diff --git
a/snowflake/src/main/java/org/apache/iceberg/snowflake/SnowflakeCatalog.java
b/snowflake/src/main/java/org/apache/iceberg/snowflake/SnowflakeCatalog.java
index 7f64b4ca49..aa32455806 100644
--- a/snowflake/src/main/java/org/apache/iceberg/snowflake/SnowflakeCatalog.java
+++ b/snowflake/src/main/java/org/apache/iceberg/snowflake/SnowflakeCatalog.java
@@ -55,6 +55,7 @@ public class SnowflakeCatalog extends BaseMetastoreCatalog
private static final String APP_IDENTIFIER = "iceberg-snowflake-catalog";
// Specifies the max length of unique id for each catalog initialized
session.
private static final int UNIQUE_ID_LENGTH = 20;
+
// Injectable factory for testing purposes.
static class FileIOFactory {
public FileIO newFileIO(String impl, Map<String, String> properties,
Object hadoopConf) {
diff --git
a/spark/v3.3/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
b/spark/v3.3/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
index 5b7b909775..06180cc9cf 100644
---
a/spark/v3.3/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
+++
b/spark/v3.3/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
@@ -35,6 +35,7 @@ import org.junit.rules.TemporaryFolder;
public class TestSnapshotTableProcedure extends SparkExtensionsTestBase {
private static final String SOURCE_NAME = "spark_catalog.default.source";
+
// Currently we can only Snapshot only out of the Spark Session Catalog
public TestSnapshotTableProcedure(
diff --git
a/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
b/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
index 32b96a580d..12011b66a5 100644
---
a/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
+++
b/spark/v3.3/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2021,8 +2021,13 @@ public abstract class TestIcebergSourceTablesBase
extends SparkTestBase {
.save(loadLocation(tableIdentifier));
List<Integer> actual =
- spark.read().format("iceberg").load(loadLocation(tableIdentifier,
"files"))
- .sort(DataFile.SPEC_ID.name()).collectAsList().stream()
+ spark
+ .read()
+ .format("iceberg")
+ .load(loadLocation(tableIdentifier, "files"))
+ .sort(DataFile.SPEC_ID.name())
+ .collectAsList()
+ .stream()
.map(r -> (Integer) r.getAs(DataFile.SPEC_ID.name()))
.collect(Collectors.toList());
diff --git
a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
index 905cb8fe07..421d6efc93 100644
---
a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
+++
b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
@@ -35,6 +35,7 @@ import org.junit.rules.TemporaryFolder;
public class TestSnapshotTableProcedure extends SparkExtensionsTestBase {
private static final String SOURCE_NAME = "spark_catalog.default.source";
+
// Currently we can only Snapshot only out of the Spark Session Catalog
public TestSnapshotTableProcedure(
diff --git
a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
index b990a37cdd..f56f1161e6 100644
---
a/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
+++
b/spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2020,8 +2020,13 @@ public abstract class TestIcebergSourceTablesBase
extends SparkTestBase {
.save(loadLocation(tableIdentifier));
List<Integer> actual =
- spark.read().format("iceberg").load(loadLocation(tableIdentifier,
"files"))
- .sort(DataFile.SPEC_ID.name()).collectAsList().stream()
+ spark
+ .read()
+ .format("iceberg")
+ .load(loadLocation(tableIdentifier, "files"))
+ .sort(DataFile.SPEC_ID.name())
+ .collectAsList()
+ .stream()
.map(r -> (Integer) r.getAs(DataFile.SPEC_ID.name()))
.collect(Collectors.toList());
diff --git
a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
index a4d0a2dfd3..6caff28bb1 100644
---
a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
+++
b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestSnapshotTableProcedure.java
@@ -38,6 +38,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
@ExtendWith(ParameterizedTestExtension.class)
public class TestSnapshotTableProcedure extends ExtensionsTestBase {
private static final String SOURCE_NAME = "spark_catalog.default.source";
+
// Currently we can only Snapshot only out of the Spark Session Catalog
@AfterEach
diff --git
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
index d37d6a8616..29216150d3 100644
---
a/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
+++
b/spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -2044,8 +2044,13 @@ public abstract class TestIcebergSourceTablesBase
extends TestBase {
.save(loadLocation(tableIdentifier));
List<Integer> actual =
- spark.read().format("iceberg").load(loadLocation(tableIdentifier,
"files"))
- .sort(DataFile.SPEC_ID.name()).collectAsList().stream()
+ spark
+ .read()
+ .format("iceberg")
+ .load(loadLocation(tableIdentifier, "files"))
+ .sort(DataFile.SPEC_ID.name())
+ .collectAsList()
+ .stream()
.map(r -> (Integer) r.getAs(DataFile.SPEC_ID.name()))
.collect(Collectors.toList());
