From c4b661382d8d04aa8dbd33f8eeb64eebb713d68e Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Mon, 3 Apr 2023 17:19:38 -0700 Subject: [PATCH 1/3] Companion changes for moving ExtensionRequest to Protobuf Signed-off-by: Sarat Vemulapalli --- .../java/org/opensearch/sdk/ExtensionsRunner.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java index d5c5e864..0cc0b8dd 100644 --- a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java +++ b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java @@ -17,6 +17,7 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.NamedWriteableRegistry; +import org.opensearch.extensions.proto.ExtensionRequestOuterClass; import org.opensearch.extensions.rest.ExtensionRestRequest; import org.opensearch.extensions.rest.RegisterRestActionsRequest; import org.opensearch.extensions.settings.RegisterCustomSettingsRequest; @@ -28,7 +29,6 @@ import org.opensearch.extensions.AddSettingsUpdateConsumerRequest; import org.opensearch.extensions.UpdateSettingsRequest; import org.opensearch.extensions.action.ExtensionActionRequest; -import org.opensearch.extensions.ExtensionsManager.RequestType; import org.opensearch.extensions.ExtensionRequest; import org.opensearch.extensions.ExtensionsManager; import org.opensearch.index.IndicesModuleRequest; @@ -539,7 +539,7 @@ public void sendRegisterCustomSettingsRequest(TransportService transportService) private void sendGenericRequestWithExceptionHandling( TransportService transportService, - RequestType requestType, + ExtensionRequestOuterClass.RequestType requestType, String orchestratorNameString, TransportResponseHandler responseHandler ) { @@ -565,7 +565,7 @@ public ClusterState sendClusterStateRequest(TransportService transportService) { transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_CLUSTER_STATE, - new ExtensionRequest(ExtensionsManager.RequestType.REQUEST_EXTENSION_CLUSTER_STATE), + new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_CLUSTER_STATE), clusterStateResponseHandler ); // Wait on cluster state response @@ -593,7 +593,7 @@ public List sendExtensionDependencyRequest(TransportServ transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, - new ExtensionRequest(ExtensionsManager.RequestType.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, uniqueId), + new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, uniqueId), extensionDependencyResponseHandler ); // Wait on Extension Dependency response @@ -616,7 +616,7 @@ public List sendExtensionDependencyRequest(TransportServ public void sendClusterSettingsRequest(TransportService transportService) { sendGenericRequestWithExceptionHandling( transportService, - ExtensionsManager.RequestType.REQUEST_EXTENSION_CLUSTER_SETTINGS, + ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_CLUSTER_SETTINGS, ExtensionsManager.REQUEST_EXTENSION_CLUSTER_SETTINGS, new ClusterSettingsResponseHandler() ); @@ -635,7 +635,7 @@ public Settings sendEnvironmentSettingsRequest(TransportService transportService transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS, - new ExtensionRequest(ExtensionsManager.RequestType.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS), + new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS), environmentSettingsResponseHandler ); // Wait on environment settings response From b8db2ff2654bbc961258835726406166a46b4464 Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Thu, 20 Apr 2023 16:13:39 -0700 Subject: [PATCH 2/3] Fixing companion changes Signed-off-by: Sarat Vemulapalli --- .../java/org/opensearch/sdk/ExtensionsRunner.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java index 0cc0b8dd..4786e8a9 100644 --- a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java +++ b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java @@ -17,7 +17,7 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.opensearch.extensions.proto.ExtensionRequestOuterClass; +import org.opensearch.extensions.proto.ExtensionRequestProto; import org.opensearch.extensions.rest.ExtensionRestRequest; import org.opensearch.extensions.rest.RegisterRestActionsRequest; import org.opensearch.extensions.settings.RegisterCustomSettingsRequest; @@ -539,7 +539,7 @@ public void sendRegisterCustomSettingsRequest(TransportService transportService) private void sendGenericRequestWithExceptionHandling( TransportService transportService, - ExtensionRequestOuterClass.RequestType requestType, + ExtensionRequestProto.RequestType requestType, String orchestratorNameString, TransportResponseHandler responseHandler ) { @@ -565,7 +565,7 @@ public ClusterState sendClusterStateRequest(TransportService transportService) { transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_CLUSTER_STATE, - new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_CLUSTER_STATE), + new ExtensionRequest(ExtensionRequestProto.RequestType.REQUEST_EXTENSION_CLUSTER_STATE), clusterStateResponseHandler ); // Wait on cluster state response @@ -593,7 +593,7 @@ public List sendExtensionDependencyRequest(TransportServ transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, - new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, uniqueId), + new ExtensionRequest(ExtensionRequestProto.RequestType.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, uniqueId), extensionDependencyResponseHandler ); // Wait on Extension Dependency response @@ -616,7 +616,7 @@ public List sendExtensionDependencyRequest(TransportServ public void sendClusterSettingsRequest(TransportService transportService) { sendGenericRequestWithExceptionHandling( transportService, - ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_CLUSTER_SETTINGS, + ExtensionRequestProto.RequestType.REQUEST_EXTENSION_CLUSTER_SETTINGS, ExtensionsManager.REQUEST_EXTENSION_CLUSTER_SETTINGS, new ClusterSettingsResponseHandler() ); @@ -635,7 +635,7 @@ public Settings sendEnvironmentSettingsRequest(TransportService transportService transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS, - new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS), + new ExtensionRequest(ExtensionRequestProto.RequestType.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS), environmentSettingsResponseHandler ); // Wait on environment settings response From 4ae54f0d5199b4c15cc013675987f4ec58b351ea Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Mon, 3 Apr 2023 17:19:38 -0700 Subject: [PATCH 3/3] Companion changes for moving ExtensionRequest to Protobuf Signed-off-by: Sarat Vemulapalli --- .../java/org/opensearch/sdk/ExtensionsRunner.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java index 71ae8bcc..b55f493c 100644 --- a/src/main/java/org/opensearch/sdk/ExtensionsRunner.java +++ b/src/main/java/org/opensearch/sdk/ExtensionsRunner.java @@ -17,6 +17,7 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.NamedWriteableRegistry; +import org.opensearch.extensions.proto.ExtensionRequestOuterClass; import org.opensearch.extensions.rest.ExtensionRestRequest; import org.opensearch.extensions.rest.RegisterRestActionsRequest; import org.opensearch.extensions.settings.RegisterCustomSettingsRequest; @@ -28,7 +29,6 @@ import org.opensearch.extensions.AddSettingsUpdateConsumerRequest; import org.opensearch.extensions.UpdateSettingsRequest; import org.opensearch.extensions.action.ExtensionActionRequest; -import org.opensearch.extensions.ExtensionsManager.RequestType; import org.opensearch.extensions.ExtensionRequest; import org.opensearch.extensions.ExtensionsManager; import org.opensearch.index.IndicesModuleRequest; @@ -545,7 +545,7 @@ public void sendRegisterCustomSettingsRequest(TransportService transportService) private void sendGenericRequestWithExceptionHandling( TransportService transportService, - RequestType requestType, + ExtensionRequestOuterClass.RequestType requestType, String orchestratorNameString, TransportResponseHandler responseHandler ) { @@ -571,7 +571,7 @@ public ClusterState sendClusterStateRequest(TransportService transportService) { transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_CLUSTER_STATE, - new ExtensionRequest(ExtensionsManager.RequestType.REQUEST_EXTENSION_CLUSTER_STATE), + new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_CLUSTER_STATE), clusterStateResponseHandler ); // Wait on cluster state response @@ -599,7 +599,7 @@ public List sendExtensionDependencyRequest(TransportServ transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, - new ExtensionRequest(ExtensionsManager.RequestType.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, uniqueId), + new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_DEPENDENCY_INFORMATION, uniqueId), extensionDependencyResponseHandler ); // Wait on Extension Dependency response @@ -622,7 +622,7 @@ public List sendExtensionDependencyRequest(TransportServ public void sendClusterSettingsRequest(TransportService transportService) { sendGenericRequestWithExceptionHandling( transportService, - ExtensionsManager.RequestType.REQUEST_EXTENSION_CLUSTER_SETTINGS, + ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_CLUSTER_SETTINGS, ExtensionsManager.REQUEST_EXTENSION_CLUSTER_SETTINGS, new ClusterSettingsResponseHandler() ); @@ -641,7 +641,7 @@ public Settings sendEnvironmentSettingsRequest(TransportService transportService transportService.sendRequest( opensearchNode, ExtensionsManager.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS, - new ExtensionRequest(ExtensionsManager.RequestType.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS), + new ExtensionRequest(ExtensionRequestOuterClass.RequestType.REQUEST_EXTENSION_ENVIRONMENT_SETTINGS), environmentSettingsResponseHandler ); // Wait on environment settings response