From 170675869f3c0478cc1ee2a0be353a2b0fc7ffb6 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Fri, 27 Dec 2024 11:09:26 -0800
Subject: [PATCH] more optionality

---
 .../cluster/metadata/SingleNodeShutdownMetadata.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java
index 4ed2e8fa1fe25..a428503f61971 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/SingleNodeShutdownMetadata.java
@@ -68,7 +68,10 @@ public class SingleNodeShutdownMetadata implements SimpleDiffable<SingleNodeShut
 
     static {
         PARSER.declareString(ConstructingObjectParser.constructorArg(), NODE_ID_FIELD);
-        PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), NODE_EPHEMERAL_ID_FIELD);
+        PARSER.declareField(ConstructingObjectParser.optionalConstructorArg(),
+            (p, c) -> p.textOrNull(),
+            NODE_EPHEMERAL_ID_FIELD,
+            ObjectParser.ValueType.STRING_OR_NULL);
         PARSER.declareString(ConstructingObjectParser.constructorArg(), TYPE_FIELD);
         PARSER.declareString(ConstructingObjectParser.constructorArg(), REASON_FIELD);
         PARSER.declareLong(ConstructingObjectParser.constructorArg(), STARTED_AT_MILLIS_FIELD);
@@ -116,6 +119,7 @@ public static SingleNodeShutdownMetadata parse(XContentParser parser) {
      */
     private SingleNodeShutdownMetadata(
         String nodeId,
+        @Nullable
         String nodeEphemeralId,
         Type type,
         String reason,