diff --git a/server/src/main/java/org/opensearch/discovery/PluginRequest.java b/server/src/main/java/org/opensearch/discovery/InitializeExtensionsRequest.java similarity index 85% rename from server/src/main/java/org/opensearch/discovery/PluginRequest.java rename to server/src/main/java/org/opensearch/discovery/InitializeExtensionsRequest.java index 332376630dd63..b241450aa77f1 100644 --- a/server/src/main/java/org/opensearch/discovery/PluginRequest.java +++ b/server/src/main/java/org/opensearch/discovery/InitializeExtensionsRequest.java @@ -23,19 +23,19 @@ * * @opensearch.internal */ -public class PluginRequest extends TransportRequest { +public class InitializeExtensionsRequest extends TransportRequest { private final DiscoveryNode sourceNode; /* * TODO change DiscoveryNode to Extension information */ private final List extensions; - public PluginRequest(DiscoveryNode sourceNode, List extensions) { + public InitializeExtensionsRequest(DiscoveryNode sourceNode, List extensions) { this.sourceNode = sourceNode; this.extensions = extensions; } - public PluginRequest(StreamInput in) throws IOException { + public InitializeExtensionsRequest(StreamInput in) throws IOException { super(in); sourceNode = new DiscoveryNode(in); extensions = in.readList(DiscoveryExtension::new); @@ -65,7 +65,7 @@ public String toString() { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - PluginRequest that = (PluginRequest) o; + InitializeExtensionsRequest that = (InitializeExtensionsRequest) o; return Objects.equals(sourceNode, that.sourceNode) && Objects.equals(extensions, that.extensions); } diff --git a/server/src/main/java/org/opensearch/discovery/PluginResponse.java b/server/src/main/java/org/opensearch/discovery/InitializeExtensionsResponse.java similarity index 88% rename from server/src/main/java/org/opensearch/discovery/PluginResponse.java rename to server/src/main/java/org/opensearch/discovery/InitializeExtensionsResponse.java index f8f20214e5846..c87909e88908f 100644 --- a/server/src/main/java/org/opensearch/discovery/PluginResponse.java +++ b/server/src/main/java/org/opensearch/discovery/InitializeExtensionsResponse.java @@ -44,14 +44,14 @@ * * @opensearch.internal */ -public class PluginResponse extends TransportResponse { +public class InitializeExtensionsResponse extends TransportResponse { private String name; - public PluginResponse(String name) { + public InitializeExtensionsResponse(String name) { this.name = name; } - public PluginResponse(StreamInput in) throws IOException { + public InitializeExtensionsResponse(StreamInput in) throws IOException { name = in.readString(); } @@ -77,7 +77,7 @@ public String toString() { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - PluginResponse that = (PluginResponse) o; + InitializeExtensionsResponse that = (InitializeExtensionsResponse) o; return Objects.equals(name, that.name); } diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsOrchestrator.java b/server/src/main/java/org/opensearch/extensions/ExtensionsOrchestrator.java index eee5a5ebd4ac6..c15976bb5daa5 100644 --- a/server/src/main/java/org/opensearch/extensions/ExtensionsOrchestrator.java +++ b/server/src/main/java/org/opensearch/extensions/ExtensionsOrchestrator.java @@ -34,8 +34,8 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.opensearch.discovery.PluginRequest; -import org.opensearch.discovery.PluginResponse; +import org.opensearch.discovery.InitializeExtensionsRequest; +import org.opensearch.discovery.InitializeExtensionsResponse; import org.opensearch.extensions.ExtensionsSettings.Extension; import org.opensearch.index.IndexModule; import org.opensearch.index.IndexService; @@ -208,15 +208,15 @@ public void extensionsInitialize() { private void extensionInitialize(DiscoveryNode extensionNode) { - final TransportResponseHandler pluginResponseHandler = new TransportResponseHandler() { + final TransportResponseHandler pluginResponseHandler = new TransportResponseHandler() { @Override - public PluginResponse read(StreamInput in) throws IOException { - return new PluginResponse(in); + public InitializeExtensionsResponse read(StreamInput in) throws IOException { + return new InitializeExtensionsResponse(in); } @Override - public void handleResponse(PluginResponse response) { + public void handleResponse(InitializeExtensionsResponse response) { for (DiscoveryExtension extension : extensionsList) { if (extension.getName().equals(response.getName())) { extensionsInitializedList.add(extension); @@ -240,7 +240,7 @@ public String executor() { transportService.sendRequest( extensionNode, REQUEST_EXTENSION_ACTION_NAME, - new PluginRequest(transportService.getLocalNode(), new ArrayList(extensionsList)), + new InitializeExtensionsRequest(transportService.getLocalNode(), new ArrayList(extensionsList)), pluginResponseHandler ); } catch (Exception e) {