From 028d058df6cc490d51e66086745e6c028eb4b9ee Mon Sep 17 00:00:00 2001
From: Eduard Tudenhoefner <etudenhoefner@gmail.com>
Date: Mon, 3 Nov 2025 15:31:06 +0100
Subject: [PATCH] Core: Minor code improvements

---
 api/src/main/java/org/apache/iceberg/PartitionSpec.java   | 8 ++------
 .../rest/responses/FetchPlanningResultResponseParser.java | 6 +-----
 .../rest/responses/FetchScanTasksResponseParser.java      | 6 +-----
 .../rest/responses/PlanTableScanResponseParser.java       | 5 +----
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/api/src/main/java/org/apache/iceberg/PartitionSpec.java b/api/src/main/java/org/apache/iceberg/PartitionSpec.java
index f059c928a967..30b9e2bc618b 100644
--- a/api/src/main/java/org/apache/iceberg/PartitionSpec.java
+++ b/api/src/main/java/org/apache/iceberg/PartitionSpec.java
@@ -19,8 +19,8 @@
 package org.apache.iceberg;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.List;
@@ -203,11 +203,7 @@ private <T> T get(StructLike data, int pos, Class<?> javaClass) {
   }
 
   private String escape(String string) {
-    try {
-      return URLEncoder.encode(string, "UTF-8");
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
-    }
+    return URLEncoder.encode(string, StandardCharsets.UTF_8);
   }
 
   public String partitionToPath(StructLike data) {
diff --git a/core/src/main/java/org/apache/iceberg/rest/responses/FetchPlanningResultResponseParser.java b/core/src/main/java/org/apache/iceberg/rest/responses/FetchPlanningResultResponseParser.java
index 5dcfe2d59a2f..925e0f57464f 100644
--- a/core/src/main/java/org/apache/iceberg/rest/responses/FetchPlanningResultResponseParser.java
+++ b/core/src/main/java/org/apache/iceberg/rest/responses/FetchPlanningResultResponseParser.java
@@ -69,11 +69,7 @@ static FetchPlanningResultResponse fromJson(
       String json, Map<Integer, PartitionSpec> specsById, boolean caseSensitive) {
     Preconditions.checkArgument(
         json != null, "Invalid fetchPlanningResult response: null or empty");
-    return JsonUtil.parse(
-        json,
-        node -> {
-          return fromJson(node, specsById, caseSensitive);
-        });
+    return JsonUtil.parse(json, node -> fromJson(node, specsById, caseSensitive));
   }
 
   public static FetchPlanningResultResponse fromJson(
diff --git a/core/src/main/java/org/apache/iceberg/rest/responses/FetchScanTasksResponseParser.java b/core/src/main/java/org/apache/iceberg/rest/responses/FetchScanTasksResponseParser.java
index f54243b8772e..bfc8a08b9047 100644
--- a/core/src/main/java/org/apache/iceberg/rest/responses/FetchScanTasksResponseParser.java
+++ b/core/src/main/java/org/apache/iceberg/rest/responses/FetchScanTasksResponseParser.java
@@ -64,11 +64,7 @@ public static void toJson(FetchScanTasksResponse response, JsonGenerator gen) th
   static FetchScanTasksResponse fromJson(
       String json, Map<Integer, PartitionSpec> specsById, boolean caseSensitive) {
     Preconditions.checkArgument(json != null, "Cannot parse fetchScanTasks response from null");
-    return JsonUtil.parse(
-        json,
-        node -> {
-          return fromJson(node, specsById, caseSensitive);
-        });
+    return JsonUtil.parse(json, node -> fromJson(node, specsById, caseSensitive));
   }
 
   public static FetchScanTasksResponse fromJson(
diff --git a/core/src/main/java/org/apache/iceberg/rest/responses/PlanTableScanResponseParser.java b/core/src/main/java/org/apache/iceberg/rest/responses/PlanTableScanResponseParser.java
index 523770e6cc36..b99cd369d894 100644
--- a/core/src/main/java/org/apache/iceberg/rest/responses/PlanTableScanResponseParser.java
+++ b/core/src/main/java/org/apache/iceberg/rest/responses/PlanTableScanResponseParser.java
@@ -76,10 +76,7 @@ static PlanTableScanResponse fromJson(
     Preconditions.checkArgument(
         json != null, "Cannot parse planTableScan response from empty or null object");
     return JsonUtil.parse(
-        json,
-        node -> {
-          return PlanTableScanResponseParser.fromJson(node, specsById, caseSensitive);
-        });
+        json, node -> PlanTableScanResponseParser.fromJson(node, specsById, caseSensitive));
   }
 
   public static PlanTableScanResponse fromJson(