address comment

mloufra · mloufra · commit 61b3461398bb · 2022-12-29T18:24:32.000Z
Signed-off-by: Frank Lou &lt;mloufra@amazon.com&gt;
diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionRequest.java b/server/src/main/java/org/opensearch/extensions/ExtensionRequest.java
@@ -10,7 +10,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.Nullable;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.transport.TransportRequest;
@@ -27,35 +26,37 @@
 public class ExtensionRequest extends TransportRequest {
     private static final Logger logger = LogManager.getLogger(ExtensionRequest.class);
     private final ExtensionsManager.RequestType requestType;
-    private final String uniqueId;
+    private final Optional<String> uniqueId;
+    private String id;
 
     public ExtensionRequest(ExtensionsManager.RequestType requestType) {
         this(requestType, null);
     }
 
-    public ExtensionRequest(ExtensionsManager.RequestType requestType, String uniqueId) {
+    public ExtensionRequest(ExtensionsManager.RequestType requestType, Optional<String> uniqueId) {
         this.requestType = requestType;
         this.uniqueId = uniqueId;
     }
 
     public ExtensionRequest(StreamInput in) throws IOException {
         this.requestType = in.readEnum(ExtensionsManager.RequestType.class);
-        this.uniqueId = in.readString();
+        this.uniqueId = id == null ? Optional.empty() : Optional.of(id);
+        id = in.readOptionalString();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeEnum(requestType);
-        out.writeString(uniqueId);
+        out.writeOptionalString(id);
     }
 
     public ExtensionsManager.RequestType getRequestType() {
         return this.requestType;
     }
 
     public Optional<String> getUniqueId() {
-        return uniqueId == null ? Optional.empty() : Optional.of(uniqueId);
+        return uniqueId == null ? Optional.empty() : uniqueId;
     }
 
     public String toString() {
diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
@@ -438,7 +438,12 @@ TransportResponse handleExtensionRequest(ExtensionRequest extensionRequest) thro
             case REQUEST_EXTENSION_ENVIRONMENT_SETTINGS:
                 return new EnvironmentSettingsResponse(this.environmentSettings);
             case REQUEST_EXTENSION_DEPENDENCY_INFORMATION:
-                String uniqueId = extensionRequest.getUniqueId().stream().filter(x -> x.length() == 1).findFirst().map(Object::toString).orElse(null);
+                String uniqueId = extensionRequest.getUniqueId()
+                    .stream()
+                    .filter(x -> x.length() == 1)
+                    .findFirst()
+                    .map(Object::toString)
+                    .orElse(null);
                 if (uniqueId == null) {
                     return new ExtensionDependencyResponse(extensions);
                 } else {
