diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ba59a70c565..b14781b4a6da4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Change default value of remote_data_ratio, which is used in Searchable Snapshots and Writeable Warm from 0 to 5 and min allowed value to 1 ([#18767](https://github.com/opensearch-project/OpenSearch/pull/18767)) - Making multi rate limiters in repository dynamic [#18069](https://github.com/opensearch-project/OpenSearch/pull/18069) - Optimize grouping for segment concurrent search by ensuring that documents within each group are as equal as possible ([#18451](https://github.com/opensearch-project/OpenSearch/pull/18451)) +- Move transport-grpc from a core plugin to a module ([#18897](https://github.com/opensearch-project/OpenSearch/pull/18897)) ### Dependencies - Bump `stefanzweifel/git-auto-commit-action` from 5 to 6 ([#18524](https://github.com/opensearch-project/OpenSearch/pull/18524)) diff --git a/plugins/transport-grpc/README.md b/modules/transport-grpc/README.md similarity index 87% rename from plugins/transport-grpc/README.md rename to modules/transport-grpc/README.md index 66f7890f109f1..6d87d3202068a 100644 --- a/plugins/transport-grpc/README.md +++ b/modules/transport-grpc/README.md @@ -1,7 +1,10 @@ # transport-grpc An auxiliary transport which runs in parallel to the REST API. -The `transport-grpc` plugin initializes a new client/server transport implementing a gRPC protocol on Netty4. +The `transport-grpc` module initializes a new client/server transport implementing a gRPC protocol on Netty4. + +**Note:** As a module, transport-grpc is included by default with all OpenSearch installations. However, it remains opt-in and must be explicitly enabled via configuration settings. + ## GRPC Settings Enable this transport with: @@ -50,7 +53,7 @@ setting 'grpc.netty.worker_count', '2' setting 'grpc.netty.max_concurrent_connection_calls', '200' setting 'grpc.netty.max_connection_age', '500ms' setting 'grpc.netty.max_connection_idle', '2m' -setting 'grpc.netty.max_msg_size: '10mb' +setting 'grpc.netty.max_msg_size', '10mb' setting 'grpc.netty.keepalive_timeout', '1s' ``` @@ -58,12 +61,20 @@ setting 'grpc.netty.keepalive_timeout', '1s' ### Unit Tests -``` -./gradlew :plugins:transport-grpc:test +```bash +./gradlew :modules:transport-grpc:test ``` ### Integration Tests +```bash +./gradlew :modules:transport-grpc:internalClusterTest ``` -./gradlew :plugins:transport-grpc:internalClusterTest + +### Running OpenSearch with gRPC Enabled + +To run OpenSearch with the gRPC transport enabled: + +```bash +./gradlew run -Dtests.opensearch.aux.transport.types="[experimental-transport-grpc]" ``` diff --git a/plugins/transport-grpc/build.gradle b/modules/transport-grpc/build.gradle similarity index 99% rename from plugins/transport-grpc/build.gradle rename to modules/transport-grpc/build.gradle index df87623dcc1e2..a58b8c365559a 100644 --- a/plugins/transport-grpc/build.gradle +++ b/modules/transport-grpc/build.gradle @@ -16,7 +16,6 @@ opensearchplugin { testClusters { integTest { - plugin(project.path) setting 'aux.transport.types', '[experimental-transport-grpc]' } } diff --git a/plugins/transport-grpc/licenses/error_prone_annotations-2.24.1.jar.sha1 b/modules/transport-grpc/licenses/error_prone_annotations-2.24.1.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/error_prone_annotations-2.24.1.jar.sha1 rename to modules/transport-grpc/licenses/error_prone_annotations-2.24.1.jar.sha1 diff --git a/plugins/transport-grpc/licenses/error_prone_annotations-LICENSE.txt b/modules/transport-grpc/licenses/error_prone_annotations-LICENSE.txt similarity index 100% rename from plugins/transport-grpc/licenses/error_prone_annotations-LICENSE.txt rename to modules/transport-grpc/licenses/error_prone_annotations-LICENSE.txt diff --git a/plugins/transport-grpc/licenses/error_prone_annotations-NOTICE.txt b/modules/transport-grpc/licenses/error_prone_annotations-NOTICE.txt similarity index 100% rename from plugins/transport-grpc/licenses/error_prone_annotations-NOTICE.txt rename to modules/transport-grpc/licenses/error_prone_annotations-NOTICE.txt diff --git a/plugins/transport-grpc/licenses/failureaccess-1.0.2.jar.sha1 b/modules/transport-grpc/licenses/failureaccess-1.0.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/failureaccess-1.0.2.jar.sha1 rename to modules/transport-grpc/licenses/failureaccess-1.0.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/failureaccess-LICENSE.txt b/modules/transport-grpc/licenses/failureaccess-LICENSE.txt similarity index 100% rename from plugins/transport-grpc/licenses/failureaccess-LICENSE.txt rename to modules/transport-grpc/licenses/failureaccess-LICENSE.txt diff --git a/plugins/transport-grpc/licenses/failureaccess-NOTICE.txt b/modules/transport-grpc/licenses/failureaccess-NOTICE.txt similarity index 100% rename from plugins/transport-grpc/licenses/failureaccess-NOTICE.txt rename to modules/transport-grpc/licenses/failureaccess-NOTICE.txt diff --git a/plugins/transport-grpc/licenses/grpc-LICENSE.txt b/modules/transport-grpc/licenses/grpc-LICENSE.txt similarity index 100% rename from plugins/transport-grpc/licenses/grpc-LICENSE.txt rename to modules/transport-grpc/licenses/grpc-LICENSE.txt diff --git a/plugins/transport-grpc/licenses/grpc-NOTICE.txt b/modules/transport-grpc/licenses/grpc-NOTICE.txt similarity index 100% rename from plugins/transport-grpc/licenses/grpc-NOTICE.txt rename to modules/transport-grpc/licenses/grpc-NOTICE.txt diff --git a/plugins/transport-grpc/licenses/grpc-api-1.68.2.jar.sha1 b/modules/transport-grpc/licenses/grpc-api-1.68.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/grpc-api-1.68.2.jar.sha1 rename to modules/transport-grpc/licenses/grpc-api-1.68.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/grpc-core-1.68.2.jar.sha1 b/modules/transport-grpc/licenses/grpc-core-1.68.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/grpc-core-1.68.2.jar.sha1 rename to modules/transport-grpc/licenses/grpc-core-1.68.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/grpc-netty-shaded-1.68.2.jar.sha1 b/modules/transport-grpc/licenses/grpc-netty-shaded-1.68.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/grpc-netty-shaded-1.68.2.jar.sha1 rename to modules/transport-grpc/licenses/grpc-netty-shaded-1.68.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/grpc-protobuf-1.68.2.jar.sha1 b/modules/transport-grpc/licenses/grpc-protobuf-1.68.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/grpc-protobuf-1.68.2.jar.sha1 rename to modules/transport-grpc/licenses/grpc-protobuf-1.68.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/grpc-protobuf-lite-1.68.2.jar.sha1 b/modules/transport-grpc/licenses/grpc-protobuf-lite-1.68.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/grpc-protobuf-lite-1.68.2.jar.sha1 rename to modules/transport-grpc/licenses/grpc-protobuf-lite-1.68.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/grpc-services-1.68.2.jar.sha1 b/modules/transport-grpc/licenses/grpc-services-1.68.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/grpc-services-1.68.2.jar.sha1 rename to modules/transport-grpc/licenses/grpc-services-1.68.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/grpc-stub-1.68.2.jar.sha1 b/modules/transport-grpc/licenses/grpc-stub-1.68.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/grpc-stub-1.68.2.jar.sha1 rename to modules/transport-grpc/licenses/grpc-stub-1.68.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/grpc-util-1.68.2.jar.sha1 b/modules/transport-grpc/licenses/grpc-util-1.68.2.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/grpc-util-1.68.2.jar.sha1 rename to modules/transport-grpc/licenses/grpc-util-1.68.2.jar.sha1 diff --git a/plugins/transport-grpc/licenses/guava-33.2.1-jre.jar.sha1 b/modules/transport-grpc/licenses/guava-33.2.1-jre.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/guava-33.2.1-jre.jar.sha1 rename to modules/transport-grpc/licenses/guava-33.2.1-jre.jar.sha1 diff --git a/plugins/transport-grpc/licenses/guava-LICENSE.txt b/modules/transport-grpc/licenses/guava-LICENSE.txt similarity index 100% rename from plugins/transport-grpc/licenses/guava-LICENSE.txt rename to modules/transport-grpc/licenses/guava-LICENSE.txt diff --git a/plugins/transport-grpc/licenses/guava-NOTICE.txt b/modules/transport-grpc/licenses/guava-NOTICE.txt similarity index 100% rename from plugins/transport-grpc/licenses/guava-NOTICE.txt rename to modules/transport-grpc/licenses/guava-NOTICE.txt diff --git a/plugins/transport-grpc/licenses/perfmark-api-0.27.0.jar.sha1 b/modules/transport-grpc/licenses/perfmark-api-0.27.0.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/perfmark-api-0.27.0.jar.sha1 rename to modules/transport-grpc/licenses/perfmark-api-0.27.0.jar.sha1 diff --git a/plugins/transport-grpc/licenses/perfmark-api-LICENSE.txt b/modules/transport-grpc/licenses/perfmark-api-LICENSE.txt similarity index 100% rename from plugins/transport-grpc/licenses/perfmark-api-LICENSE.txt rename to modules/transport-grpc/licenses/perfmark-api-LICENSE.txt diff --git a/plugins/transport-grpc/licenses/perfmark-api-NOTICE.txt b/modules/transport-grpc/licenses/perfmark-api-NOTICE.txt similarity index 100% rename from plugins/transport-grpc/licenses/perfmark-api-NOTICE.txt rename to modules/transport-grpc/licenses/perfmark-api-NOTICE.txt diff --git a/plugins/transport-grpc/licenses/protobufs-0.6.0.jar.sha1 b/modules/transport-grpc/licenses/protobufs-0.6.0.jar.sha1 similarity index 100% rename from plugins/transport-grpc/licenses/protobufs-0.6.0.jar.sha1 rename to modules/transport-grpc/licenses/protobufs-0.6.0.jar.sha1 diff --git a/plugins/transport-grpc/licenses/protobufs-LICENSE.txt b/modules/transport-grpc/licenses/protobufs-LICENSE.txt similarity index 100% rename from plugins/transport-grpc/licenses/protobufs-LICENSE.txt rename to modules/transport-grpc/licenses/protobufs-LICENSE.txt diff --git a/plugins/transport-grpc/licenses/protobufs-NOTICE.txt b/modules/transport-grpc/licenses/protobufs-NOTICE.txt similarity index 100% rename from plugins/transport-grpc/licenses/protobufs-NOTICE.txt rename to modules/transport-grpc/licenses/protobufs-NOTICE.txt diff --git a/plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/DocumentServiceIT.java b/modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/DocumentServiceIT.java similarity index 100% rename from plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/DocumentServiceIT.java rename to modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/DocumentServiceIT.java diff --git a/plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/GrpcTransportBaseIT.java b/modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/GrpcTransportBaseIT.java similarity index 100% rename from plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/GrpcTransportBaseIT.java rename to modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/GrpcTransportBaseIT.java diff --git a/plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportIT.java b/modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportIT.java similarity index 100% rename from plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportIT.java rename to modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportIT.java diff --git a/plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/SearchServiceIT.java b/modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/SearchServiceIT.java similarity index 100% rename from plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/SearchServiceIT.java rename to modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/SearchServiceIT.java diff --git a/plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportIT.java b/modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportIT.java similarity index 100% rename from plugins/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportIT.java rename to modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportIT.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/GrpcPlugin.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/GrpcPlugin.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/GrpcPlugin.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/GrpcPlugin.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransport.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransport.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransport.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransport.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListener.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListener.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListener.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListener.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListener.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListener.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListener.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListener.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/FieldAndFormatProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/FieldAndFormatProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/FieldAndFormatProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/FieldAndFormatProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/HighlightBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/HighlightBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/HighlightBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/HighlightBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/IndicesOptionsProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/IndicesOptionsProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/IndicesOptionsProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/IndicesOptionsProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/OperatorProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/OperatorProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/OperatorProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/OperatorProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/PointInTimeBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/PointInTimeBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/PointInTimeBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/PointInTimeBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/ProtoActionsProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/ProtoActionsProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/ProtoActionsProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/ProtoActionsProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/RescorerBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/RescorerBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/RescorerBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/RescorerBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchAfterBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchAfterBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchAfterBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchAfterBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchRequestProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchRequestProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchRequestProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchRequestProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchTypeProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchTypeProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchTypeProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchTypeProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SliceBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SliceBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SliceBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/SliceBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/StoredFieldsContextProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/StoredFieldsContextProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/StoredFieldsContextProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/StoredFieldsContextProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/AbstractQueryBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/AbstractQueryBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/AbstractQueryBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/AbstractQueryBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoConverter.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoConverter.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoConverter.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoConverter.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoConverter.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoConverter.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoConverter.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoConverter.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverter.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverter.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverter.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverter.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterRegistry.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterRegistry.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterRegistry.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterRegistry.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoConverter.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoConverter.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoConverter.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoConverter.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsLookupProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsLookupProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsLookupProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsLookupProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoConverter.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoConverter.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoConverter.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoConverter.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/FieldSortBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/FieldSortBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/FieldSortBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/FieldSortBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortOrderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortOrderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortOrderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortOrderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/SuggestBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/SuggestBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/SuggestBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/SuggestBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/TermSuggestionBuilderProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/TermSuggestionBuilderProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/TermSuggestionBuilderProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/TermSuggestionBuilderProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/FieldValueProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/FieldValueProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/FieldValueProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/FieldValueProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/ObjectMapProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/ObjectMapProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/ObjectMapProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/ObjectMapProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/StructProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/StructProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/StructProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/StructProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/common/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkItemResponseProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkItemResponseProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkItemResponseProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkItemResponseProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkResponseProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkResponseProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkResponseProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkResponseProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocWriteResponseProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocWriteResponseProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocWriteResponseProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocWriteResponseProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocumentFieldProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocumentFieldProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocumentFieldProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocumentFieldProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/ShardInfoProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/ShardInfoProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/ShardInfoProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/ShardInfoProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/VersionTypeProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/VersionTypeProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/VersionTypeProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/VersionTypeProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/GetResultProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/GetResultProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/GetResultProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/GetResultProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/CircuitBreakingExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/CircuitBreakingExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/CircuitBreakingExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/CircuitBreakingExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/FailedNodeExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/FailedNodeExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/FailedNodeExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/FailedNodeExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ParsingExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ParsingExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ParsingExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ParsingExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ResponseLimitBreachedExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ResponseLimitBreachedExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ResponseLimitBreachedExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ResponseLimitBreachedExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ScriptExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ScriptExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ScriptExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ScriptExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchParseExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchParseExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchParseExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchParseExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchPhaseExecutionExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchPhaseExecutionExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchPhaseExecutionExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchPhaseExecutionExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ShardOperationFailedExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ShardOperationFailedExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ShardOperationFailedExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ShardOperationFailedExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/TooManyBucketsExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/TooManyBucketsExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/TooManyBucketsExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/TooManyBucketsExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/opensearchexception/OpenSearchExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/opensearchexception/OpenSearchExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/opensearchexception/OpenSearchExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/opensearchexception/OpenSearchExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/opensearchexception/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/opensearchexception/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/opensearchexception/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/opensearchexception/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/DefaultShardOperationFailedExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/DefaultShardOperationFailedExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/DefaultShardOperationFailedExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/DefaultShardOperationFailedExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ReplicationResponseShardInfoFailureProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ReplicationResponseShardInfoFailureProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ReplicationResponseShardInfoFailureProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ReplicationResponseShardInfoFailureProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardOperationFailedExceptionProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardOperationFailedExceptionProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardOperationFailedExceptionProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardOperationFailedExceptionProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardSearchFailureProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardSearchFailureProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardSearchFailureProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardSearchFailureProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/SnapshotShardFailureProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/SnapshotShardFailureProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/SnapshotShardFailureProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/SnapshotShardFailureProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/HighlightFieldProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/HighlightFieldProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/HighlightFieldProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/HighlightFieldProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/ProtoActionsProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/ProtoActionsProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/ProtoActionsProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/ProtoActionsProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitsProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitsProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitsProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitsProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseSectionsProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseSectionsProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseSectionsProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseSectionsProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchSortValuesProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchSortValuesProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchSortValuesProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchSortValuesProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/ShardStatisticsProtoUtils.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/ShardStatisticsProtoUtils.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/ShardStatisticsProtoUtils.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/ShardStatisticsProtoUtils.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/response/search/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/DocumentServiceImpl.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/DocumentServiceImpl.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/DocumentServiceImpl.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/DocumentServiceImpl.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/SearchServiceImpl.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/SearchServiceImpl.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/SearchServiceImpl.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/SearchServiceImpl.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/services/package-info.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransport.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransport.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransport.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransport.java diff --git a/plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/package-info.java b/modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/package-info.java similarity index 100% rename from plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/package-info.java rename to modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/package-info.java diff --git a/plugins/transport-grpc/src/main/plugin-metadata/plugin-security.policy b/modules/transport-grpc/src/main/plugin-metadata/plugin-security.policy similarity index 100% rename from plugins/transport-grpc/src/main/plugin-metadata/plugin-security.policy rename to modules/transport-grpc/src/main/plugin-metadata/plugin-security.policy diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/GrpcPluginTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/GrpcPluginTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/GrpcPluginTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/GrpcPluginTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListenerTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListenerTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListenerTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListenerTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListenerTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListenerTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListenerTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListenerTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/IndicesOptionsProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/IndicesOptionsProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/IndicesOptionsProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/IndicesOptionsProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/OperatorProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/OperatorProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/OperatorProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/OperatorProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/PointInTimeBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/PointInTimeBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/PointInTimeBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/PointInTimeBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/ScriptFieldProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/ScriptFieldProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/ScriptFieldProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/ScriptFieldProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchAfterBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchAfterBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchAfterBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchAfterBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchRequestProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchRequestProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchRequestProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchRequestProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SortBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SortBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SortBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/SortBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/StoredFieldsContextProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/StoredFieldsContextProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/StoredFieldsContextProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/StoredFieldsContextProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/AbstractQueryBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/AbstractQueryBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/AbstractQueryBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/AbstractQueryBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/EmptyQueryBuilderProtoConverterRegistry.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/EmptyQueryBuilderProtoConverterRegistry.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/EmptyQueryBuilderProtoConverterRegistry.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/EmptyQueryBuilderProtoConverterRegistry.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoConverterTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoConverterTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoConverterTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoConverterTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchAllQueryBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoConverterTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoConverterTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoConverterTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoConverterTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/MatchNoneQueryBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterRegistryTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterRegistryTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterRegistryTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterRegistryTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoTestUtils.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoTestUtils.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoTestUtils.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/QueryBuilderProtoTestUtils.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoConverterTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoConverterTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoConverterTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoConverterTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermQueryBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsLookupProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsLookupProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsLookupProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsLookupProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoConverterTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoConverterTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoConverterTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoConverterTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/query/TermsQueryBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/FieldSortBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/FieldSortBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/FieldSortBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/FieldSortBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortOrderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortOrderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortOrderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/sort/SortOrderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/SuggestBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/SuggestBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/SuggestBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/SuggestBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/TermSuggestionBuilderProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/TermSuggestionBuilderProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/TermSuggestionBuilderProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/request/search/suggest/TermSuggestionBuilderProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/BulkResponseProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/BulkResponseProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/BulkResponseProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/BulkResponseProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/FieldValueProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/FieldValueProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/FieldValueProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/FieldValueProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/ObjectMapProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/ObjectMapProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/ObjectMapProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/ObjectMapProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/StructProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/StructProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/StructProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/common/StructProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkItemResponseProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkItemResponseProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkItemResponseProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/bulk/BulkItemResponseProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocWriteResponseProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocWriteResponseProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocWriteResponseProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocWriteResponseProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocumentFieldProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocumentFieldProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocumentFieldProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/DocumentFieldProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/ShardInfoProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/ShardInfoProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/ShardInfoProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/ShardInfoProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/VersionTypeProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/VersionTypeProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/VersionTypeProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/common/VersionTypeProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/GetResultProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/GetResultProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/GetResultProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/document/get/GetResultProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/CircuitBreakingExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/CircuitBreakingExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/CircuitBreakingExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/CircuitBreakingExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/FailedNodeExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/FailedNodeExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/FailedNodeExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/FailedNodeExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/OpenSearchExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/OpenSearchExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/OpenSearchExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/OpenSearchExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ParsingExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ParsingExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ParsingExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ParsingExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ResponseLimitBreachedExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ResponseLimitBreachedExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ResponseLimitBreachedExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ResponseLimitBreachedExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ScriptExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ScriptExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ScriptExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ScriptExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchParseExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchParseExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchParseExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchParseExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchPhaseExecutionExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchPhaseExecutionExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchPhaseExecutionExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/SearchPhaseExecutionExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ShardOperationFailedExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ShardOperationFailedExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ShardOperationFailedExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/ShardOperationFailedExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/TooManyBucketsExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/TooManyBucketsExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/TooManyBucketsExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/TooManyBucketsExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/DefaultShardOperationFailedExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/DefaultShardOperationFailedExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/DefaultShardOperationFailedExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/DefaultShardOperationFailedExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardOperationFailedExceptionProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardOperationFailedExceptionProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardOperationFailedExceptionProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/exceptions/shardoperationfailedexception/ShardOperationFailedExceptionProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/HighlightFieldProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/HighlightFieldProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/HighlightFieldProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/HighlightFieldProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitNestedIdentityProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitNestedIdentityProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitNestedIdentityProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitNestedIdentityProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitsProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitsProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitsProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchHitsProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/proto/response/search/SearchResponseProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/BulkRequestProtoUtilsTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/BulkRequestProtoUtilsTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/BulkRequestProtoUtilsTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/BulkRequestProtoUtilsTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/SearchServiceImplTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/SearchServiceImplTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/SearchServiceImplTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/SearchServiceImplTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/document/DocumentServiceImplTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/document/DocumentServiceImplTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/document/DocumentServiceImplTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/services/document/DocumentServiceImplTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/NettyGrpcClient.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/NettyGrpcClient.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/NettyGrpcClient.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/NettyGrpcClient.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportTests.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportTests.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportTests.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportTests.java diff --git a/plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureSettingsHelpers.java b/modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureSettingsHelpers.java similarity index 100% rename from plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureSettingsHelpers.java rename to modules/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureSettingsHelpers.java diff --git a/plugins/transport-grpc/src/test/resources/README.txt b/modules/transport-grpc/src/test/resources/README.txt similarity index 100% rename from plugins/transport-grpc/src/test/resources/README.txt rename to modules/transport-grpc/src/test/resources/README.txt diff --git a/plugins/transport-grpc/src/test/resources/netty4-client-secure.jks b/modules/transport-grpc/src/test/resources/netty4-client-secure.jks similarity index 100% rename from plugins/transport-grpc/src/test/resources/netty4-client-secure.jks rename to modules/transport-grpc/src/test/resources/netty4-client-secure.jks diff --git a/plugins/transport-grpc/src/test/resources/netty4-server-secure.jks b/modules/transport-grpc/src/test/resources/netty4-server-secure.jks similarity index 100% rename from plugins/transport-grpc/src/test/resources/netty4-server-secure.jks rename to modules/transport-grpc/src/test/resources/netty4-server-secure.jks