cosmetic changes

Author: sfc-gh-prsingh

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

@@ -217,7 +217,7 @@ private CloseableIterable<FileScanTask> fetchPlanningResult(String planId) {
 
   private CloseableIterable<FileScanTask> scanTasksIterable(
       List<String> planTasks, List<FileScanTask> fileScanTasks) {
-    if (!planTasks.isEmpty()) {
+    if (planTasks != null && !planTasks.isEmpty()) {
       Endpoint.check(supportedEndpoints, Endpoint.V1_FETCH_TABLE_SCAN_PLAN_TASKS);
     }
 

core/src/test/java/org/apache/iceberg/catalog/CatalogTests.java

@@ -45,7 +45,6 @@
 import org.apache.iceberg.FilesTable;
 import org.apache.iceberg.HasTableOperations;
 import org.apache.iceberg.HistoryEntry;
-import org.apache.iceberg.PartitionData;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.ReachableFileUtil;
 import org.apache.iceberg.ReplaceSortOrder;
@@ -3374,24 +3373,4 @@ private List<Namespace> concat(List<Namespace> starting, Namespace... additional
     namespaces.addAll(Arrays.asList(additional));
     return namespaces;
   }
-
-  protected void assertBoundFileScanTasks(Table table, PartitionSpec partitionSpec) {
-    PartitionData partitionData = new PartitionData(partitionSpec.partitionType());
-    try (CloseableIterable<FileScanTask> tasks = table.newScan().planFiles()) {
-      Streams.stream(tasks)
-          .forEach(
-              task -> {
-                // assert file scan task spec being bound
-                assertThat(task.spec().equals(partitionSpec));
-                // assert data file spec being bound
-                assertThat(task.file().partition().equals(partitionData));
-                // assert all delete files in task are bound
-                task.deletes()
-                    .forEach(
-                        deleteFile -> assertThat(deleteFile.partition().equals(partitionData)));
-              });
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
-  }
 }

core/src/test/java/org/apache/iceberg/rest/RESTCatalogAdapter.java

@@ -313,8 +313,8 @@ public <T extends RESTResponse> T handleRequest(
                   catalog,
                   ident,
                   request,
-                  planningBehavior::shouldPlanTableScanAsync,
-                  scan -> planningBehavior.numberFileScanTasksPerPlanTask()));
+                  planningBehavior()::shouldPlanTableScanAsync,
+                  scan -> planningBehavior().numberFileScanTasksPerPlanTask()));
         }
 
       case FETCH_PLANNING_RESULT:

core/src/test/java/org/apache/iceberg/rest/RESTCatalogTestInfrastructure.java

@@ -83,6 +83,8 @@ public <T extends RESTResponse> T execute(
                   Class<T> responseType,
                   Consumer<ErrorResponse> errorHandler,
                   Consumer<Map<String, String>> responseHeaders) {
+                // this doesn't use a Mockito spy because this is used for catalog tests, which have
+                // different method calls
                 if (!ResourcePaths.tokens().equals(request.path())) {
                   if (ResourcePaths.config().equals(request.path())) {
                     assertThat(request.headers().entries()).containsAll(catalogHeaders.entries());
@@ -203,7 +205,8 @@ public <T> T roundTripSerialize(T payload, String description) {
         }
         return (T) reader.readValue(MAPPER.writeValueAsString(message));
       } else {
-        return payload;
+        // use Map so that Jackson doesn't try to instantiate ImmutableMap from payload.getClass()
+        return (T) MAPPER.readValue(MAPPER.writeValueAsString(payload), Map.class);
       }
     } catch (JsonProcessingException e) {
       throw new RuntimeException(

core/src/test/java/org/apache/iceberg/rest/TestRESTCatalog.java

@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
@@ -100,15 +99,11 @@
 import org.mockito.stubbing.Answer;
 
 public class TestRESTCatalog extends CatalogTests<RESTCatalog> {
-
-  private static final ObjectMapper MAPPER = RESTObjectMapper.mapper();
   private static final ResourcePaths RESOURCE_PATHS =
       ResourcePaths.forCatalogProperties(Maps.newHashMap());
 
   @TempDir protected Path temp;
-
   protected RESTCatalogTestInfrastructure infrastructure = new RESTCatalogTestInfrastructure();
-
   // Expose infrastructure components as protected fields for backward compatibility with tests
   protected RESTCatalog restCatalog;
   protected InMemoryCatalog backendCatalog;