From bf8d25fe1578ef199d64fb609c0299728ec58910 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Mon, 18 Nov 2024 18:14:35 +0100
Subject: [PATCH] Core: Serialize `null` when there is no current snapshot
 (#11560)

---
 .../main/java/org/apache/iceberg/TableMetadataParser.java | 8 +++++---
 .../rest/responses/TestLoadTableResponseParser.java       | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/apache/iceberg/TableMetadataParser.java b/core/src/main/java/org/apache/iceberg/TableMetadataParser.java
index 5abfb74974f7..c244b3996c9e 100644
--- a/core/src/main/java/org/apache/iceberg/TableMetadataParser.java
+++ b/core/src/main/java/org/apache/iceberg/TableMetadataParser.java
@@ -214,9 +214,11 @@ public static void toJson(TableMetadata metadata, JsonGenerator generator) throw
     // write properties map
     JsonUtil.writeStringMap(PROPERTIES, metadata.properties(), generator);
 
-    generator.writeNumberField(
-        CURRENT_SNAPSHOT_ID,
-        metadata.currentSnapshot() != null ? metadata.currentSnapshot().snapshotId() : -1);
+    if (metadata.currentSnapshot() != null) {
+      generator.writeNumberField(CURRENT_SNAPSHOT_ID, metadata.currentSnapshot().snapshotId());
+    } else {
+      generator.writeNullField(CURRENT_SNAPSHOT_ID);
+    }
 
     toJson(metadata.refs(), generator);
 
diff --git a/core/src/test/java/org/apache/iceberg/rest/responses/TestLoadTableResponseParser.java b/core/src/test/java/org/apache/iceberg/rest/responses/TestLoadTableResponseParser.java
index cc6f4cfc74d7..b4879dd39f51 100644
--- a/core/src/test/java/org/apache/iceberg/rest/responses/TestLoadTableResponseParser.java
+++ b/core/src/test/java/org/apache/iceberg/rest/responses/TestLoadTableResponseParser.java
@@ -107,7 +107,7 @@ public void roundTripSerde() {
                 + "      \"fields\" : [ ]\n"
                 + "    } ],\n"
                 + "    \"properties\" : { },\n"
-                + "    \"current-snapshot-id\" : -1,\n"
+                + "    \"current-snapshot-id\" : null,\n"
                 + "    \"refs\" : { },\n"
                 + "    \"snapshots\" : [ ],\n"
                 + "    \"statistics\" : [ ],\n"
@@ -180,7 +180,7 @@ public void roundTripSerdeWithConfig() {
                 + "      \"fields\" : [ ]\n"
                 + "    } ],\n"
                 + "    \"properties\" : { },\n"
-                + "    \"current-snapshot-id\" : -1,\n"
+                + "    \"current-snapshot-id\" : null,\n"
                 + "    \"refs\" : { },\n"
                 + "    \"snapshots\" : [ ],\n"
                 + "    \"statistics\" : [ ],\n"
@@ -283,7 +283,7 @@ public void roundTripSerdeWithCredentials() {
                 + "      \"fields\" : [ ]\n"
                 + "    } ],\n"
                 + "    \"properties\" : { },\n"
-                + "    \"current-snapshot-id\" : -1,\n"
+                + "    \"current-snapshot-id\" : null,\n"
                 + "    \"refs\" : { },\n"
                 + "    \"snapshots\" : [ ],\n"
                 + "    \"statistics\" : [ ],\n"