Fixes a bug in toXContent

Signed-off-by: Darshit Chanpura <[email protected]>
DarshitChanpura · Dec 31, 2024 · 6fb5055 · 6fb5055
1 parent 00ba7a7
commit 6fb5055
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/server/src/main/java/org/opensearch/accesscontrol/resources/SharedWithScope.java b/server/src/main/java/org/opensearch/accesscontrol/resources/SharedWithScope.java
@@ -160,11 +160,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             if (recipients.isEmpty()) {
                 return builder;
             }
-            builder.startObject();
             for (Map.Entry<RecipientType, Set<String>> entry : recipients.entrySet()) {
                 builder.array(entry.getKey().getType(), entry.getValue().toArray());
             }
-            builder.endObject();
             return builder;
         }
     }

diff --git a/server/src/test/java/org/opensearch/accesscontrol/resources/ShareWithTests.java b/server/src/test/java/org/opensearch/accesscontrol/resources/ShareWithTests.java
@@ -12,6 +12,7 @@
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.OpenSearchTestCase;
@@ -154,7 +155,10 @@ public void testFromXContentWithUnexpectedEndOfInput() throws IOException {
     }
 
     public void testToXContentBuildsCorrectly() throws IOException {
-        SharedWithScope scope = new SharedWithScope("scope1", new SharedWithScope.ScopeRecipients(Map.of()));
+        SharedWithScope scope = new SharedWithScope(
+            "scope1",
+            new SharedWithScope.ScopeRecipients(Map.of(new RecipientType("users"), Set.of("bleh")))
+        );
 
         Set<SharedWithScope> scopes = new HashSet<>();
         scopes.add(scope);
@@ -163,11 +167,11 @@ public void testToXContentBuildsCorrectly() throws IOException {
 
         XContentBuilder builder = JsonXContent.contentBuilder();
 
-        shareWith.toXContent(builder, null);
+        shareWith.toXContent(builder, ToXContent.EMPTY_PARAMS);
 
         String result = builder.toString();
 
-        String expected = "{\"scope1\":{}}";
+        String expected = "{\"scope1\":{\"users\":[\"bleh\"]}}";
 
         MatcherAssert.assertThat(expected.length(), equalTo(result.length()));
         MatcherAssert.assertThat(expected, equalTo(result));