Address Intellij inspection findings

aliyun/src/main/java/org/apache/iceberg/aliyun/oss/BaseOSSFile.java

@@ -29,7 +29,7 @@
 abstract class BaseOSSFile {
   private final OSS client;
   private final OSSURI uri;
-  private AliyunProperties aliyunProperties;
+  private final AliyunProperties aliyunProperties;
   private SimplifiedObjectMeta metadata;
   private final MetricsContext metrics;
 

aliyun/src/test/java/org/apache/iceberg/aliyun/oss/mock/AliyunOSSMockExtension.java

@@ -101,7 +101,7 @@ public void tearDownBucket(String bucket) {
   }
 
   public static class Builder {
-    private Map<String, Object> props = Maps.newHashMap();
+    private final Map<String, Object> props = Maps.newHashMap();
 
     public Builder silent() {
       props.put(AliyunOSSMockApp.PROP_SILENT, true);

aliyun/src/test/java/org/apache/iceberg/aliyun/oss/mock/AliyunOSSMockLocalController.java

@@ -420,11 +420,11 @@ public boolean markSupported() {
      * A caller has caused a request that would cross the {@code maxLength} boundary.
      *
      * @param maxLength The max count of bytes to read.
-     * @param count The count of bytes read.
+     * @param bytesRead The count of bytes read.
      * @throws IOException Subclasses may throw.
      * @since 2.12.0
      */
-    protected void onMaxLength(final long maxLength, final long pCount) throws IOException {
+    protected void onMaxLength(final long maxLength, final long bytesRead) throws IOException {
       // for subclasses
     }
 

api/src/main/java/org/apache/iceberg/PartitionSpec.java

@@ -365,7 +365,7 @@ public static class Builder {
     private final Schema schema;
     private final List<PartitionField> fields = Lists.newArrayList();
     private final Set<String> partitionNames = Sets.newHashSet();
-    private Map<Map.Entry<Integer, String>, PartitionField> dedupFields = Maps.newHashMap();
+    private final Map<Map.Entry<Integer, String>, PartitionField> dedupFields = Maps.newHashMap();
     private int specId = 0;
     private final AtomicInteger lastAssignedFieldId =
         new AtomicInteger(unpartitionedLastAssignedId());
@@ -410,7 +410,7 @@ private void checkAndAddPartitionName(String name, Integer sourceColumnId) {
         }
       }
       Preconditions.checkArgument(
-          name != null && !name.isEmpty(), "Cannot use empty or null partition name: %s", name);
+          !name.isEmpty(), "Cannot use empty or null partition name: %s", name);
       Preconditions.checkArgument(
           !partitionNames.contains(name), "Cannot use partition name more than once: %s", name);
       partitionNames.add(name);

api/src/main/java/org/apache/iceberg/Schema.java

@@ -67,8 +67,8 @@ public class Schema implements Serializable {
   private transient Map<Integer, Accessor<StructLike>> idToAccessor = null;
   private transient Map<Integer, String> idToName = null;
   private transient Set<Integer> identifierFieldIdSet = null;
-  private transient Map<Integer, Integer> idsToReassigned;
-  private transient Map<Integer, Integer> idsToOriginal;
+  private final transient Map<Integer, Integer> idsToReassigned;
+  private final transient Map<Integer, Integer> idsToOriginal;
 
   public Schema(List<NestedField> columns, Map<String, Integer> aliases) {
     this(columns, aliases, ImmutableSet.of());

api/src/main/java/org/apache/iceberg/SortOrderBuilder.java

@@ -113,5 +113,5 @@ default R desc(Term term) {
   default R caseSensitive(boolean caseSensitive) {
     throw new UnsupportedOperationException(
         this.getClass().getName() + " doesn't implement caseSensitive");
-  };
+  }
 }

api/src/main/java/org/apache/iceberg/io/FileIO.java

@@ -94,7 +94,7 @@ default void deleteFile(OutputFile file) {
    */
   default Map<String, String> properties() {
     throw new UnsupportedOperationException(
-        String.format("%s does not expose configuration properties", this.getClass().toString()));
+        String.format("%s does not expose configuration properties", this.getClass()));
   }
 
   /**

api/src/main/java/org/apache/iceberg/metrics/DefaultTimer.java

@@ -66,31 +66,22 @@ public void record(long amount, TimeUnit unit) {
 
   @Override
   public <T> T time(Supplier<T> supplier) {
-    Timed timed = start();
-    try {
+    try (Timed ignore = start()) {
       return supplier.get();
-    } finally {
-      timed.stop();
     }
   }
 
   @Override
   public <T> T timeCallable(Callable<T> callable) throws Exception {
-    Timed timed = start();
-    try {
+    try (Timed ignore = start()) {
       return callable.call();
-    } finally {
-      timed.stop();
     }
   }
 
   @Override
   public void time(Runnable runnable) {
-    Timed timed = start();
-    try {
+    try (Timed ignore = start()) {
       runnable.run();
-    } finally {
-      timed.stop();
     }
   }
 

api/src/main/java/org/apache/iceberg/util/BucketUtil.java

@@ -36,7 +36,7 @@ public class BucketUtil {
   private BucketUtil() {}
 
   public static int hash(int value) {
-    return MURMUR3.hashLong((long) value).asInt();
+    return MURMUR3.hashLong(value).asInt();
   }
 
   public static int hash(long value) {
@@ -56,7 +56,7 @@ private static long doubleToLongBits(double value) {
   }
 
   public static int hash(float value) {
-    return MURMUR3.hashLong(doubleToLongBits((double) value)).asInt();
+    return MURMUR3.hashLong(doubleToLongBits(value)).asInt();
   }
 
   public static int hash(double value) {

api/src/test/java/org/apache/iceberg/io/TestableCloseableIterable.java

@@ -22,7 +22,7 @@
 
 public class TestableCloseableIterable implements CloseableIterable<Integer> {
   private Boolean closed = false;
-  private TestableCloseableIterator iterator = new TestableCloseableIterator();
+  private final TestableCloseableIterator iterator = new TestableCloseableIterator();
 
   @Override
   public CloseableIterator<Integer> iterator() {

api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java

@@ -383,7 +383,7 @@ private int hashBytes(byte[] bytes, int offset, int length) {
    */
   private static UUID newUUID(byte[] bytes) {
     try {
-      return uuidBytesConstructor.newInstance((Object) bytes);
+      return uuidBytesConstructor.newInstance(bytes);
     } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
       throw new RuntimeException(e);
     }

api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java

@@ -32,6 +32,7 @@
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import org.apache.iceberg.PartitionSpec;
@@ -309,7 +310,7 @@ public void testBucketStringInclusive() {
 
   @Test
   public void testBucketByteBufferStrict() throws Exception {
-    ByteBuffer value = ByteBuffer.wrap("abcdefg".getBytes("UTF-8"));
+    ByteBuffer value = ByteBuffer.wrap("abcdefg".getBytes(StandardCharsets.UTF_8));
     Schema schema = new Schema(optional(1, "value", Types.BinaryType.get()));
     PartitionSpec spec = PartitionSpec.builderFor(schema).bucket("value", 10).build();
 
@@ -322,15 +323,15 @@ public void testBucketByteBufferStrict() throws Exception {
     assertProjectionStrictValue(
         spec, greaterThanOrEqual("value", value), Expression.Operation.FALSE);
 
-    ByteBuffer anotherValue = ByteBuffer.wrap("abcdehij".getBytes("UTF-8"));
+    ByteBuffer anotherValue = ByteBuffer.wrap("abcdehij".getBytes(StandardCharsets.UTF_8));
     assertProjectionStrict(
         spec, notIn("value", value, anotherValue), Expression.Operation.NOT_IN, "[4, 6]");
     assertProjectionStrictValue(spec, in("value", value, anotherValue), Expression.Operation.FALSE);
   }
 
   @Test
   public void testBucketByteBufferInclusive() throws Exception {
-    ByteBuffer value = ByteBuffer.wrap("abcdefg".getBytes("UTF-8"));
+    ByteBuffer value = ByteBuffer.wrap("abcdefg".getBytes(StandardCharsets.UTF_8));
     Schema schema = new Schema(optional(1, "value", Types.BinaryType.get()));
     PartitionSpec spec = PartitionSpec.builderFor(schema).bucket("value", 10).build();
 
@@ -344,7 +345,7 @@ public void testBucketByteBufferInclusive() throws Exception {
     assertProjectionInclusiveValue(
         spec, greaterThanOrEqual("value", value), Expression.Operation.TRUE);
 
-    ByteBuffer anotherValue = ByteBuffer.wrap("abcdehij".getBytes("UTF-8"));
+    ByteBuffer anotherValue = ByteBuffer.wrap("abcdehij".getBytes(StandardCharsets.UTF_8));
     assertProjectionInclusive(
         spec, in("value", value, anotherValue), Expression.Operation.IN, "[4, 6]");
     assertProjectionInclusiveValue(

api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java

@@ -32,6 +32,7 @@
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
@@ -447,10 +448,11 @@ public void testStringInclusive() {
 
   @Test
   public void testBinaryStrict() throws Exception {
-    ByteBuffer value = ByteBuffer.wrap("abcdefg".getBytes("UTF-8"));
+    ByteBuffer value = ByteBuffer.wrap("abcdefg".getBytes(StandardCharsets.UTF_8));
     Schema schema = new Schema(optional(1, "value", Types.BinaryType.get()));
     PartitionSpec spec = PartitionSpec.builderFor(schema).truncate("value", 5).build();
-    String expectedValue = TransformUtil.base64encode(ByteBuffer.wrap("abcde".getBytes("UTF-8")));
+    String expectedValue =
+        TransformUtil.base64encode(ByteBuffer.wrap("abcde".getBytes(StandardCharsets.UTF_8)));
 
     assertProjectionStrict(spec, lessThan("value", value), Expression.Operation.LT, expectedValue);
     assertProjectionStrict(
@@ -463,7 +465,7 @@ public void testBinaryStrict() throws Exception {
         spec, notEqual("value", value), Expression.Operation.NOT_EQ, expectedValue);
     assertProjectionStrictValue(spec, equal("value", value), Expression.Operation.FALSE);
 
-    ByteBuffer anotherValue = ByteBuffer.wrap("abcdehij".getBytes("UTF-8"));
+    ByteBuffer anotherValue = ByteBuffer.wrap("abcdehij".getBytes(StandardCharsets.UTF_8));
     assertProjectionStrict(
         spec,
         notIn("value", value, anotherValue),
@@ -474,10 +476,11 @@ public void testBinaryStrict() throws Exception {
 
   @Test
   public void testBinaryInclusive() throws Exception {
-    ByteBuffer value = ByteBuffer.wrap("abcdefg".getBytes("UTF-8"));
+    ByteBuffer value = ByteBuffer.wrap("abcdefg".getBytes(StandardCharsets.UTF_8));
     Schema schema = new Schema(optional(1, "value", Types.BinaryType.get()));
     PartitionSpec spec = PartitionSpec.builderFor(schema).truncate("value", 5).build();
-    String expectedValue = TransformUtil.base64encode(ByteBuffer.wrap("abcde".getBytes("UTF-8")));
+    String expectedValue =
+        TransformUtil.base64encode(ByteBuffer.wrap("abcde".getBytes(StandardCharsets.UTF_8)));
 
     assertProjectionInclusive(
         spec, lessThan("value", value), Expression.Operation.LT_EQ, expectedValue);
@@ -490,7 +493,7 @@ public void testBinaryInclusive() throws Exception {
     assertProjectionInclusive(spec, equal("value", value), Expression.Operation.EQ, expectedValue);
     assertProjectionInclusiveValue(spec, notEqual("value", value), Expression.Operation.TRUE);
 
-    ByteBuffer anotherValue = ByteBuffer.wrap("abcdehij".getBytes("UTF-8"));
+    ByteBuffer anotherValue = ByteBuffer.wrap("abcdehij".getBytes(StandardCharsets.UTF_8));
     assertProjectionInclusive(
         spec,
         in("value", value, anotherValue),

api/src/test/java/org/apache/iceberg/util/TestCharSequenceMap.java

@@ -31,8 +31,8 @@ public class TestCharSequenceMap {
 
   @Test
   public void nullString() {
-    assertThat(CharSequenceMap.create()).doesNotContainKey((String) null);
-    assertThat(CharSequenceMap.create()).doesNotContainValue((String) null);
+    assertThat(CharSequenceMap.create()).doesNotContainKey(null);
+    assertThat(CharSequenceMap.create()).doesNotContainValue(null);
   }
 
   @Test

arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java

@@ -145,7 +145,7 @@ private int readIntLittleEndian() throws IOException {
     int ch3 = inputStream.read();
     int ch2 = inputStream.read();
     int ch1 = inputStream.read();
-    return (ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0);
+    return (ch1 << 24) + (ch2 << 16) + (ch3 << 8) + ch4;
   }
 
   /** Reads the next byteWidth little endian int. */
@@ -166,7 +166,7 @@ private int readIntLittleEndianPaddedOnBitWidth() throws IOException {
           int ch3 = inputStream.read();
           int ch2 = inputStream.read();
           int ch1 = inputStream.read();
-          return (ch1 << 16) + (ch2 << 8) + (ch3 << 0);
+          return (ch1 << 16) + (ch2 << 8) + ch3;
         }
       case 4:
         {

aws/src/integration/java/org/apache/iceberg/aws/lakeformation/LakeFormationTestBase.java

@@ -128,15 +128,12 @@ public class LakeFormationTestBase {
 
   @BeforeAll
   public static void beforeClass() throws Exception {
-    lfRegisterPathRoleName = LF_REGISTER_PATH_ROLE_PREFIX + UUID.randomUUID().toString();
-    lfPrivilegedRoleName = LF_PRIVILEGED_ROLE_PREFIX + UUID.randomUUID().toString();
-    lfRegisterPathRoleS3PolicyName =
-        LF_REGISTER_PATH_ROLE_S3_POLICY_PREFIX + UUID.randomUUID().toString();
-    lfRegisterPathRoleLfPolicyName =
-        LF_REGISTER_PATH_ROLE_LF_POLICY_PREFIX + UUID.randomUUID().toString();
-    lfRegisterPathRoleIamPolicyName =
-        LF_REGISTER_PATH_ROLE_IAM_POLICY_PREFIX + UUID.randomUUID().toString();
-    lfPrivilegedRolePolicyName = LF_PRIVILEGED_ROLE_POLICY_PREFIX + UUID.randomUUID().toString();
+    lfRegisterPathRoleName = LF_REGISTER_PATH_ROLE_PREFIX + UUID.randomUUID();
+    lfPrivilegedRoleName = LF_PRIVILEGED_ROLE_PREFIX + UUID.randomUUID();
+    lfRegisterPathRoleS3PolicyName = LF_REGISTER_PATH_ROLE_S3_POLICY_PREFIX + UUID.randomUUID();
+    lfRegisterPathRoleLfPolicyName = LF_REGISTER_PATH_ROLE_LF_POLICY_PREFIX + UUID.randomUUID();
+    lfRegisterPathRoleIamPolicyName = LF_REGISTER_PATH_ROLE_IAM_POLICY_PREFIX + UUID.randomUUID();
+    lfPrivilegedRolePolicyName = LF_PRIVILEGED_ROLE_POLICY_PREFIX + UUID.randomUUID();
 
     iam =
         IamClient.builder()

aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3FileIOIntegration.java

@@ -119,7 +119,7 @@ public static void afterClass() {
 
   @BeforeEach
   public void beforeEach() {
-    objectKey = String.format("%s/%s", prefix, UUID.randomUUID().toString());
+    objectKey = String.format("%s/%s", prefix, UUID.randomUUID());
     objectUri = String.format("s3://%s/%s", bucketName, objectKey);
     clientFactory.initialize(Maps.newHashMap());
   }

aws/src/integration/java/org/apache/iceberg/aws/s3/TestS3MultipartUpload.java

@@ -64,7 +64,7 @@ public static void afterClass() {
 
   @BeforeEach
   public void before() {
-    String objectKey = String.format("%s/%s", prefix, UUID.randomUUID().toString());
+    String objectKey = String.format("%s/%s", prefix, UUID.randomUUID());
     objectUri = String.format("s3://%s/%s", bucketName, objectKey);
   }
 

aws/src/main/java/org/apache/iceberg/aws/AwsClientProperties.java

@@ -67,7 +67,7 @@ public class AwsClientProperties implements Serializable {
   public static final String CLIENT_REGION = "client.region";
 
   private String clientRegion;
-  private String clientCredentialsProvider;
+  private final String clientCredentialsProvider;
   private final Map<String, String> clientCredentialsProviderProperties;
 
   public AwsClientProperties() {

aws/src/main/java/org/apache/iceberg/aws/AwsProperties.java

@@ -213,25 +213,25 @@ public class AwsProperties implements Serializable {
   private static final String HTTP_CLIENT_PREFIX = "http-client.";
   private final Set<software.amazon.awssdk.services.sts.model.Tag> stsClientAssumeRoleTags;
 
-  private String clientAssumeRoleArn;
-  private String clientAssumeRoleExternalId;
-  private int clientAssumeRoleTimeoutSec;
-  private String clientAssumeRoleRegion;
-  private String clientAssumeRoleSessionName;
-  private String clientCredentialsProvider;
+  private final String clientAssumeRoleArn;
+  private final String clientAssumeRoleExternalId;
+  private final int clientAssumeRoleTimeoutSec;
+  private final String clientAssumeRoleRegion;
+  private final String clientAssumeRoleSessionName;
+  private final String clientCredentialsProvider;
   private final Map<String, String> clientCredentialsProviderProperties;
 
-  private String glueEndpoint;
+  private final String glueEndpoint;
   private String glueCatalogId;
   private boolean glueCatalogSkipArchive;
   private boolean glueCatalogSkipNameValidation;
   private boolean glueLakeFormationEnabled;
 
   private String dynamoDbTableName;
-  private String dynamoDbEndpoint;
+  private final String dynamoDbEndpoint;
 
   private String restSigningRegion;
-  private String restSigningName;
+  private final String restSigningName;
   private String restAccessKeyId;
   private String restSecretAccessKey;
   private String restSessionToken;

aws/src/main/java/org/apache/iceberg/aws/glue/GlueCatalog.java

@@ -387,7 +387,7 @@ public void renameTable(TableIdentifier from, TableIdentifier to) {
           "Cannot rename %s to %s because namespace %s does not exist", from, to, to.namespace());
     }
     // keep metadata
-    Table fromTable = null;
+    Table fromTable;
     String fromTableDbName =
         IcebergToGlueConverter.getDatabaseName(from, awsProperties.glueCatalogSkipNameValidation());
     String fromTableName =

aws/src/main/java/org/apache/iceberg/aws/lakeformation/LakeFormationAwsClientFactory.java

@@ -139,8 +139,8 @@ private LakeFormationClient lakeFormation() {
   }
 
   static class LakeFormationCredentialsProvider implements AwsCredentialsProvider {
-    private LakeFormationClient client;
-    private String tableArn;
+    private final LakeFormationClient client;
+    private final String tableArn;
 
     LakeFormationCredentialsProvider(LakeFormationClient lakeFormationClient, String tableArn) {
       this.client = lakeFormationClient;