Updates SampleResource class structure

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
DarshitChanpura · Dec 13, 2024 · 8845812 · 8845812
1 parent ca377f6
commit 8845812
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/sample-resource-plugin/src/main/java/org/opensearch/sample/SampleResource.java b/sample-resource-plugin/src/main/java/org/opensearch/sample/SampleResource.java
@@ -12,6 +12,7 @@
 package org.opensearch.sample;
 
 import java.io.IOException;
+import java.util.Map;
 
 import org.opensearch.core.common.io.stream.StreamInput;
 import org.opensearch.core.common.io.stream.StreamOutput;
@@ -22,11 +23,15 @@
 public class SampleResource implements Resource {
 
     private String name;
+    private String description;
+    private Map<String, String> attributes;
 
     public SampleResource() {}
 
     public SampleResource(StreamInput in) throws IOException {
         this.name = in.readString();
+        this.description = in.readString();
+        this.attributes = in.readMap(StreamInput::readString, StreamInput::readString);
     }
 
     @Override
@@ -41,12 +46,14 @@ public String getResourceName() {
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        return builder.startObject().field("name", name).endObject();
+        return builder.startObject().field("name", name).field("description", description).field("attributes", attributes).endObject();
     }
 
     @Override
-    public void writeTo(StreamOutput streamOutput) throws IOException {
-        streamOutput.writeString(name);
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeString(name);
+        out.writeString(description);
+        out.writeMap(attributes, StreamOutput::writeString, StreamOutput::writeString);
     }
 
     @Override
@@ -57,4 +64,12 @@ public String getWriteableName() {
     public void setName(String name) {
         this.name = name;
     }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setAttributes(Map<String, String> attributes) {
+        this.attributes = attributes;
+    }
 }
diff --git a/...src/main/java/org/opensearch/sample/actions/resource/create/CreateResourceRestAction.java b/...src/main/java/org/opensearch/sample/actions/resource/create/CreateResourceRestAction.java
@@ -44,8 +44,12 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
         }
 
         String name = (String) source.get("name");
+        String description = source.containsKey("description") ? (String) source.get("description") : null;
+        Map<String, String> attributes = source.containsKey("attributes") ? (Map<String, String>) source.get("attributes") : null;
         SampleResource resource = new SampleResource();
         resource.setName(name);
+        resource.setDescription(description);
+        resource.setAttributes(attributes);
         final CreateResourceRequest createSampleResourceRequest = new CreateResourceRequest(resource);
         return channel -> client.executeLocally(
             CreateResourceAction.INSTANCE,