Add UT

Signed-off-by: Shivansh Arora <hishiv@amazon.com>

libs/core/src/main/java/org/opensearch/core/xcontent/XContentParserUtils.java

@@ -38,6 +38,8 @@
 import org.opensearch.core.xcontent.XContentParser.Token;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.function.Consumer;
 
@@ -178,4 +180,14 @@ public static <T> void parseTypedKeysObject(XContentParser parser, String delimi
             throw new ParsingException(parser.getTokenLocation(), "Failed to parse object: empty key");
         }
     }
+
+    public static List<String> parseStringList(XContentParser parser) throws IOException {
+        List<String> valueList = new ArrayList<>();
+        ensureExpectedToken(Token.START_ARRAY, parser.currentToken(), parser);
+        while (parser.nextToken() != Token.END_ARRAY) {
+            ensureExpectedToken(Token.VALUE_STRING, parser.currentToken(), parser);
+            valueList.add(parser.text());
+        }
+        return valueList;
+    }
 }

server/src/main/java/org/opensearch/cluster/RepositoryCleanupInProgress.java

@@ -133,7 +133,8 @@ public static RepositoryCleanupInProgress fromXContent(XContentParser parser) th
                 if ("repository".equals(currentFieldName)) {
                     repository = parser.text();
                 } else if ("repository_state_id".equals(currentFieldName)) {
-                    // only XContent parsed with {@link Metadata.CONTEXT_MODE_GATEWAY} will have the repository state id and can be deserialized
+                    // only XContent parsed with {@link Metadata.CONTEXT_MODE_GATEWAY} will have the repository state id and can be
+                    // deserialized
                     repositoryStateId = parser.longValue();
                 } else {
                     throw new IllegalArgumentException("unknown field [" + currentFieldName + "]");

server/src/main/java/org/opensearch/cluster/RestoreInProgress.java

@@ -32,7 +32,6 @@
 
 package org.opensearch.cluster;
 
-import org.elasticsearch.snapshots.SnapshotId;
 import org.opensearch.Version;
 import org.opensearch.cluster.ClusterState.Custom;
 import org.opensearch.cluster.metadata.Metadata;
@@ -365,14 +364,23 @@ public static Entry fromXContent(XContentParser parser) throws IOException {
                                         throw new IllegalArgumentException("unknown field [" + currentFieldName + "]");
                                 }
                             }
-                            shards.put(new ShardId(indexName, indexUUID, shardId), new ShardRestoreStatus(nodeId, State.fromValue((byte) restoreState), reason));
+                            shards.put(
+                                new ShardId(indexName, indexUUID, shardId),
+                                new ShardRestoreStatus(nodeId, State.fromValue((byte) restoreState), reason)
+                            );
                         }
                         break;
                     default:
                         throw new IllegalArgumentException("unknown field [" + currentFieldName + "]");
                 }
             }
-            return new Entry(uuid, new Snapshot(snapshotRepository, new SnapshotId(snapshotName, snapshotUUID)), State.fromValue((byte) state), indices, shards);
+            return new Entry(
+                uuid,
+                new Snapshot(snapshotRepository, new SnapshotId(snapshotName, snapshotUUID)),
+                State.fromValue((byte) state),
+                indices,
+                shards
+            );
         }
     }
 
@@ -663,27 +671,3 @@ public void toXContent(Entry entry, XContentBuilder builder, ToXContent.Params p
         entry.toXContent(builder, params);
     }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

server/src/main/java/org/opensearch/cluster/SnapshotDeletionsInProgress.java

@@ -291,7 +291,6 @@ public static SnapshotDeletionsInProgress fromXContent(XContentParser parser) th
         return SnapshotDeletionsInProgress.of(entries);
     }
 
-
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder("SnapshotDeletionsInProgress[");

server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java

@@ -870,9 +870,12 @@ public static Entry fromXContent(XContentParser parser) throws IOException {
                                         throw new IllegalArgumentException("unknown field [" + currentShardField + "]");
                                 }
                             }
-                            shards.put(new ShardId(index, shardId),
-                                reason != null ? new ShardSnapshotStatus(nodeId, shardState, reason, generation) :
-                                new ShardSnapshotStatus(nodeId, shardState, generation));
+                            shards.put(
+                                new ShardId(index, shardId),
+                                reason != null
+                                    ? new ShardSnapshotStatus(nodeId, shardState, reason, generation)
+                                    : new ShardSnapshotStatus(nodeId, shardState, generation)
+                            );
                         }
                         break;
                     case DATA_STREAMS:
@@ -927,9 +930,12 @@ public static Entry fromXContent(XContentParser parser) throws IOException {
                                         throw new IllegalArgumentException("unknown field [" + currentFieldName + "]");
                                 }
                             }
-                            clones.put(new RepositoryShardId(new IndexId(index, indexId), shardId),
-                                reason != null ? new ShardSnapshotStatus(nodeId, ShardState.fromValue(snapshotShardStatus), reason, generation) :
-                                new ShardSnapshotStatus(nodeId, ShardState.fromValue(snapshotShardStatus), generation));
+                            clones.put(
+                                new RepositoryShardId(new IndexId(index, indexId), shardId),
+                                reason != null
+                                    ? new ShardSnapshotStatus(nodeId, ShardState.fromValue(snapshotShardStatus), reason, generation)
+                                    : new ShardSnapshotStatus(nodeId, ShardState.fromValue(snapshotShardStatus), generation)
+                            );
                         }
                         break;
                     case VERSION:
@@ -1202,7 +1208,7 @@ public static State fromValue(byte value) {
         }
 
         public static State fromString(String value) {
-            switch(value) {
+            switch (value) {
                 case "INIT":
                     return INIT;
                 case "STARTED":

server/src/main/java/org/opensearch/repositories/IndexId.java

@@ -36,11 +36,11 @@
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.common.io.stream.Writeable;
-import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.core.index.Index;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.Objects;

server/src/main/java/org/opensearch/snapshots/SnapshotId.java

@@ -149,6 +149,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     }
 
     public static SnapshotId fromXContent(XContentParser parser) throws IOException {
+        if (parser.currentToken() == null) { // fresh parser? move to next token
+            parser.nextToken();
+        }
         XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser);
         String name = null;
         String uuid = null;

server/src/test/java/org/opensearch/snapshots/SnapshotIdTests.java

@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.snapshots;
+
+import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.MediaType;
+import org.opensearch.core.xcontent.MediaTypeRegistry;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.test.XContentTestUtils;
+
+import java.io.IOException;
+import java.util.Collections;
+
+public class SnapshotIdTests extends OpenSearchTestCase {
+    public void testToXContent() throws IOException {
+        SnapshotId snapshotId = new SnapshotId("repo", "snapshot");
+        XContentBuilder builder = JsonXContent.contentBuilder().prettyPrint();
+        snapshotId.toXContent(builder, null);
+        assertEquals("{\n" + "  \"name\" : \"repo\",\n" + "  \"uuid\" : \"snapshot\"\n" + "}", builder.toString());
+    }
+
+    public void testFromXContent() throws IOException {
+        doFromXContentTestWithRandomFields(false);
+    }
+
+    public void testFromXContentWithRandomField() throws IOException {
+        doFromXContentTestWithRandomFields(true);
+    }
+
+    private void doFromXContentTestWithRandomFields(boolean addRandomFields) throws IOException {
+        SnapshotId snapshotId = new SnapshotId(randomAlphaOfLengthBetween(5, 10), randomAlphaOfLengthBetween(5, 10));
+        boolean humanReadable = randomBoolean();
+        final MediaType mediaType = MediaTypeRegistry.JSON;
+        BytesReference originalBytes = toShuffledXContent(
+            snapshotId,
+            mediaType,
+            new ToXContent.MapParams(Collections.emptyMap()),
+            humanReadable
+        );
+
+        if (addRandomFields) {
+            String unsupportedField = "unsupported_field";
+            BytesReference mutated = BytesReference.bytes(
+                XContentTestUtils.insertIntoXContent(
+                    mediaType.xContent(),
+                    originalBytes,
+                    Collections.singletonList(""),
+                    () -> unsupportedField,
+                    () -> randomAlphaOfLengthBetween(3, 10)
+                )
+            );
+            IllegalArgumentException iae = expectThrows(
+                IllegalArgumentException.class,
+                () -> SnapshotId.fromXContent(createParser(mediaType.xContent(), mutated))
+            );
+            assertEquals("unknown field [" + unsupportedField + "]", iae.getMessage());
+        } else {
+            try (XContentParser parser = createParser(mediaType.xContent(), originalBytes)) {
+                SnapshotId parsedSnapshotId = SnapshotId.fromXContent(parser);
+                assertEquals(snapshotId, parsedSnapshotId);
+            }
+        }
+    }
+}

server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java

@@ -42,7 +42,6 @@
 import org.opensearch.cluster.SnapshotsInProgress.ShardState;
 import org.opensearch.cluster.SnapshotsInProgress.State;
 import org.opensearch.cluster.metadata.Metadata;
-import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.xcontent.json.JsonXContent;
@@ -214,7 +213,13 @@ public void testToXContent() throws IOException {
     }
 
     public void testToXContent_deletion() throws IOException {
-        SnapshotDeletionsInProgress.Entry entry = new SnapshotDeletionsInProgress.Entry(List.of(new SnapshotId("name1", "uuid1")), "repo", 10000000L, 10000L, SnapshotDeletionsInProgress.State.WAITING);
+        SnapshotDeletionsInProgress.Entry entry = new SnapshotDeletionsInProgress.Entry(
+            List.of(new SnapshotId("name1", "uuid1")),
+            "repo",
+            10000000L,
+            10000L,
+            SnapshotDeletionsInProgress.State.WAITING
+        );
         SnapshotDeletionsInProgress sdip = SnapshotDeletionsInProgress.of(List.of(entry));
         boolean humanReadable = false;
         XContentBuilder builder = JsonXContent.contentBuilder().prettyPrint();