[GRPC] Rename package org.opensearch.plugin.transport.grpc to org.opensearch.transport.grpc

CHANGELOG.md

@@ -56,6 +56,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - 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))
 - Remove `experimental` designation from transport-grpc settings ([#18915](https://github.com/opensearch-project/OpenSearch/pull/18915))
+- Rename package org.opensearch.plugin,transport.grpc to org.opensearch.transport.grpc ([#18923](https://github.com/opensearch-project/OpenSearch/pull/18923))
 
 ### Dependencies
 - Bump `stefanzweifel/git-auto-commit-action` from 5 to 6 ([#18524](https://github.com/opensearch-project/OpenSearch/pull/18524))

modules/transport-grpc/build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'opensearch.internal-cluster-test'
 
 opensearchplugin {
   description = 'gRPC based transport implementation'
-  classname = 'org.opensearch.plugin.transport.grpc.GrpcPlugin'
+  classname = 'org.opensearch.transport.grpc.GrpcPlugin'
 }
 
 testClusters {

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/DocumentServiceIT.java → modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/DocumentServiceIT.java

@@ -6,14 +6,14 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc;
+package org.opensearch.transport.grpc;
 
-import org.opensearch.plugin.transport.grpc.ssl.NettyGrpcClient;
 import org.opensearch.protobufs.BulkRequest;
 import org.opensearch.protobufs.BulkRequestBody;
 import org.opensearch.protobufs.BulkResponse;
 import org.opensearch.protobufs.IndexOperation;
 import org.opensearch.protobufs.services.DocumentServiceGrpc;
+import org.opensearch.transport.grpc.ssl.NettyGrpcClient;
 
 import io.grpc.ManagedChannel;
 

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/GrpcTransportBaseIT.java → modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/GrpcTransportBaseIT.java

@@ -6,16 +6,16 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc;
+package org.opensearch.transport.grpc;
 
 import org.opensearch.action.index.IndexResponse;
 import org.opensearch.common.network.NetworkAddress;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.common.transport.TransportAddress;
-import org.opensearch.plugin.transport.grpc.ssl.NettyGrpcClient;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchIntegTestCase;
+import org.opensearch.transport.grpc.ssl.NettyGrpcClient;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -26,8 +26,8 @@
 
 import io.grpc.health.v1.HealthCheckResponse;
 
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.GRPC_TRANSPORT_SETTING_KEY;
 import static org.opensearch.transport.AuxTransport.AUX_TRANSPORT_TYPES_KEY;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.GRPC_TRANSPORT_SETTING_KEY;
 
 /**
  * Base test class for gRPC transport integration tests.

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransportIT.java → modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/Netty4GrpcServerTransportIT.java

@@ -6,11 +6,11 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc;
+package org.opensearch.transport.grpc;
 
 import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.opensearch.cluster.health.ClusterHealthStatus;
-import org.opensearch.plugin.transport.grpc.ssl.NettyGrpcClient;
+import org.opensearch.transport.grpc.ssl.NettyGrpcClient;
 
 import io.grpc.health.v1.HealthCheckResponse;
 

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/SearchServiceIT.java → modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/SearchServiceIT.java

@@ -6,13 +6,13 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc;
+package org.opensearch.transport.grpc;
 
-import org.opensearch.plugin.transport.grpc.ssl.NettyGrpcClient;
 import org.opensearch.protobufs.SearchRequest;
 import org.opensearch.protobufs.SearchRequestBody;
 import org.opensearch.protobufs.SearchResponse;
 import org.opensearch.protobufs.services.SearchServiceGrpc;
+import org.opensearch.transport.grpc.ssl.NettyGrpcClient;
 
 import io.grpc.ManagedChannel;
 

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransportIT.java → modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/ssl/SecureNetty4GrpcServerTransportIT.java

@@ -6,20 +6,20 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.ssl;
+package org.opensearch.transport.grpc.ssl;
 
 import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.common.transport.TransportAddress;
-import org.opensearch.plugin.transport.grpc.GrpcPlugin;
 import org.opensearch.plugins.NetworkPlugin;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.plugins.SecureAuxTransportSettingsProvider;
 import org.opensearch.plugins.SecureHttpTransportSettingsProvider;
 import org.opensearch.plugins.SecureSettingsFactory;
 import org.opensearch.plugins.SecureTransportSettingsProvider;
 import org.opensearch.test.OpenSearchIntegTestCase;
+import org.opensearch.transport.grpc.GrpcPlugin;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,11 +28,11 @@
 
 import io.grpc.health.v1.HealthCheckResponse;
 
-import static org.opensearch.plugin.transport.grpc.ssl.SecureNetty4GrpcServerTransport.GRPC_SECURE_TRANSPORT_SETTING_KEY;
-import static org.opensearch.plugin.transport.grpc.ssl.SecureSettingsHelpers.getServerClientAuthNone;
-import static org.opensearch.plugin.transport.grpc.ssl.SecureSettingsHelpers.getServerClientAuthOptional;
-import static org.opensearch.plugin.transport.grpc.ssl.SecureSettingsHelpers.getServerClientAuthRequired;
 import static org.opensearch.transport.AuxTransport.AUX_TRANSPORT_TYPES_KEY;
+import static org.opensearch.transport.grpc.ssl.SecureNetty4GrpcServerTransport.GRPC_SECURE_TRANSPORT_SETTING_KEY;
+import static org.opensearch.transport.grpc.ssl.SecureSettingsHelpers.getServerClientAuthNone;
+import static org.opensearch.transport.grpc.ssl.SecureSettingsHelpers.getServerClientAuthOptional;
+import static org.opensearch.transport.grpc.ssl.SecureSettingsHelpers.getServerClientAuthRequired;
 
 public abstract class SecureNetty4GrpcServerTransportIT extends OpenSearchIntegTestCase {
 

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/GrpcPlugin.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/GrpcPlugin.java

@@ -5,7 +5,7 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.plugin.transport.grpc;
+package org.opensearch.transport.grpc;
 
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
@@ -18,12 +18,6 @@
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
-import org.opensearch.plugin.transport.grpc.proto.request.search.query.AbstractQueryBuilderProtoUtils;
-import org.opensearch.plugin.transport.grpc.proto.request.search.query.QueryBuilderProtoConverter;
-import org.opensearch.plugin.transport.grpc.proto.request.search.query.QueryBuilderProtoConverterRegistry;
-import org.opensearch.plugin.transport.grpc.services.DocumentServiceImpl;
-import org.opensearch.plugin.transport.grpc.services.SearchServiceImpl;
-import org.opensearch.plugin.transport.grpc.ssl.SecureNetty4GrpcServerTransport;
 import org.opensearch.plugins.ExtensiblePlugin;
 import org.opensearch.plugins.NetworkPlugin;
 import org.opensearch.plugins.Plugin;
@@ -34,6 +28,12 @@
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.AuxTransport;
 import org.opensearch.transport.client.Client;
+import org.opensearch.transport.grpc.proto.request.search.query.AbstractQueryBuilderProtoUtils;
+import org.opensearch.transport.grpc.proto.request.search.query.QueryBuilderProtoConverter;
+import org.opensearch.transport.grpc.proto.request.search.query.QueryBuilderProtoConverterRegistry;
+import org.opensearch.transport.grpc.services.DocumentServiceImpl;
+import org.opensearch.transport.grpc.services.SearchServiceImpl;
+import org.opensearch.transport.grpc.ssl.SecureNetty4GrpcServerTransport;
 import org.opensearch.watcher.ResourceWatcherService;
 
 import java.util.ArrayList;
@@ -45,17 +45,17 @@
 
 import io.grpc.BindableService;
 
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_BIND_HOST;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_HOST;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_KEEPALIVE_TIMEOUT;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_MAX_CONCURRENT_CONNECTION_CALLS;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_MAX_CONNECTION_AGE;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_MAX_CONNECTION_IDLE;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_PORT;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_PUBLISH_HOST;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_PUBLISH_PORT;
-import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_WORKER_COUNT;
-import static org.opensearch.plugin.transport.grpc.ssl.SecureNetty4GrpcServerTransport.SETTING_GRPC_SECURE_PORT;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_BIND_HOST;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_HOST;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_KEEPALIVE_TIMEOUT;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_MAX_CONCURRENT_CONNECTION_CALLS;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_MAX_CONNECTION_AGE;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_MAX_CONNECTION_IDLE;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_PORT;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_PUBLISH_HOST;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_PUBLISH_PORT;
+import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_WORKER_COUNT;
+import static org.opensearch.transport.grpc.ssl.SecureNetty4GrpcServerTransport.SETTING_GRPC_SECURE_PORT;
 
 /**
  * Main class for the gRPC plugin.

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/Netty4GrpcServerTransport.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/Netty4GrpcServerTransport.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc;
+package org.opensearch.transport.grpc;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/BulkRequestActionListener.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/listeners/BulkRequestActionListener.java

@@ -6,13 +6,13 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.listeners;
+package org.opensearch.transport.grpc.listeners;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.bulk.BulkResponse;
 import org.opensearch.core.action.ActionListener;
-import org.opensearch.plugin.transport.grpc.proto.response.document.bulk.BulkResponseProtoUtils;
+import org.opensearch.transport.grpc.proto.response.document.bulk.BulkResponseProtoUtils;
 
 import java.io.IOException;
 

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/SearchRequestActionListener.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/listeners/SearchRequestActionListener.java

@@ -6,13 +6,13 @@
 * compatible open source license.
 */
 
-package org.opensearch.plugin.transport.grpc.listeners;
+package org.opensearch.transport.grpc.listeners;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.core.action.ActionListener;
-import org.opensearch.plugin.transport.grpc.proto.response.search.SearchResponseProtoUtils;
+import org.opensearch.transport.grpc.proto.response.search.SearchResponseProtoUtils;
 
 import java.io.IOException;
 

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/listeners/package-info.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/listeners/package-info.java

@@ -7,7 +7,7 @@
  */
 
 /**
- * Action listeners for the gRPC transport plugin.
+ * Action listeners for the gRPC transport module.
  * This package contains listeners that handle responses from OpenSearch actions and convert them to gRPC responses.
  */
-package org.opensearch.plugin.transport.grpc.listeners;
+package org.opensearch.transport.grpc.listeners;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/package-info.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/package-info.java

@@ -10,4 +10,4 @@
  * gRPC transport implementation for OpenSearch.
  * Provides network communication using the gRPC protocol.
  */
-package org.opensearch.plugin.transport.grpc;
+package org.opensearch.transport.grpc;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/package-info.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/package-info.java

@@ -10,4 +10,4 @@
  * This package contains Protocol Buffer conversion methods for OpenSearch objects.
  * These methods aim to centralize all Protocol Buffer conversion logic in the transport-grpc module.
  */
-package org.opensearch.plugin.transport.grpc.proto;
+package org.opensearch.transport.grpc.proto;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/FetchSourceContextProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/FetchSourceContextProtoUtils.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.proto.request.common;
+package org.opensearch.transport.grpc.proto.request.common;
 
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentParser;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ObjectMapProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/ObjectMapProtoUtils.java

@@ -5,7 +5,7 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.plugin.transport.grpc.proto.request.common;
+package org.opensearch.transport.grpc.proto.request.common;
 
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.protobufs.ObjectMap;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/OpTypeProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/OpTypeProtoUtils.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.proto.request.common;
+package org.opensearch.transport.grpc.proto.request.common;
 
 import org.opensearch.action.DocWriteRequest;
 import org.opensearch.protobufs.OpType;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/RefreshProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/RefreshProtoUtils.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.proto.request.common;
+package org.opensearch.transport.grpc.proto.request.common;
 
 import org.opensearch.action.support.WriteRequest;
 

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/ScriptProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/ScriptProtoUtils.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.proto.request.common;
+package org.opensearch.transport.grpc.proto.request.common;
 
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.protobufs.InlineScript;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/common/package-info.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/package-info.java

@@ -7,7 +7,7 @@
  */
 
 /**
- * Common utility classes for request handling in the gRPC transport plugin.
+ * Common utility classes for request handling in the gRPC transport module.
  * This package contains utilities for converting Protocol Buffer common request elements to OpenSearch internal requests.
  */
-package org.opensearch.plugin.transport.grpc.proto.request.common;
+package org.opensearch.transport.grpc.proto.request.common;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtils.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.proto.request.document.bulk;
+package org.opensearch.transport.grpc.proto.request.document.bulk;
 
 import org.opensearch.action.support.ActiveShardCount;
 import org.opensearch.protobufs.WaitForActiveShards;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.proto.request.document.bulk;
+package org.opensearch.transport.grpc.proto.request.document.bulk;
 
 import org.opensearch.action.DocWriteRequest;
 import org.opensearch.action.bulk.BulkRequestParser;
@@ -21,9 +21,6 @@
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.VersionType;
 import org.opensearch.index.seqno.SequenceNumbers;
-import org.opensearch.plugin.transport.grpc.proto.request.common.FetchSourceContextProtoUtils;
-import org.opensearch.plugin.transport.grpc.proto.request.common.ScriptProtoUtils;
-import org.opensearch.plugin.transport.grpc.proto.response.document.common.VersionTypeProtoUtils;
 import org.opensearch.protobufs.BulkRequest;
 import org.opensearch.protobufs.BulkRequestBody;
 import org.opensearch.protobufs.CreateOperation;
@@ -33,6 +30,9 @@
 import org.opensearch.protobufs.UpdateOperation;
 import org.opensearch.script.Script;
 import org.opensearch.search.fetch.subphase.FetchSourceContext;
+import org.opensearch.transport.grpc.proto.request.common.FetchSourceContextProtoUtils;
+import org.opensearch.transport.grpc.proto.request.common.ScriptProtoUtils;
+import org.opensearch.transport.grpc.proto.response.document.common.VersionTypeProtoUtils;
 
 import java.util.List;
 import java.util.Objects;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/BulkRequestProtoUtils.java

@@ -6,17 +6,17 @@
  * compatible open source license.
  */
 
-package org.opensearch.plugin.transport.grpc.proto.request.document.bulk;
+package org.opensearch.transport.grpc.proto.request.document.bulk;
 
 import org.opensearch.action.bulk.BulkShardRequest;
-import org.opensearch.plugin.transport.grpc.proto.request.common.FetchSourceContextProtoUtils;
-import org.opensearch.plugin.transport.grpc.proto.request.common.RefreshProtoUtils;
 import org.opensearch.protobufs.BulkRequest;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.document.RestBulkAction;
 import org.opensearch.search.fetch.subphase.FetchSourceContext;
 import org.opensearch.transport.client.Requests;
 import org.opensearch.transport.client.node.NodeClient;
+import org.opensearch.transport.grpc.proto.request.common.FetchSourceContextProtoUtils;
+import org.opensearch.transport.grpc.proto.request.common.RefreshProtoUtils;
 
 /**
  * Handler for bulk requests in gRPC.

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/document/bulk/package-info.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/package-info.java

@@ -7,7 +7,7 @@
  */
 
 /**
- * Utility classes for handling document bulk requests in the gRPC transport plugin.
+ * Utility classes for handling document bulk requests in the gRPC transport module.
  * This package contains utilities for converting Protocol Buffer bulk requests to OpenSearch internal requests.
  */
-package org.opensearch.plugin.transport.grpc.proto.request.document.bulk;
+package org.opensearch.transport.grpc.proto.request.document.bulk;

modules/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/proto/request/search/CollapseBuilderProtoUtils.java → modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/search/CollapseBuilderProtoUtils.java

@@ -5,7 +5,7 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.plugin.transport.grpc.proto.request.search;
+package org.opensearch.transport.grpc.proto.request.search;
 
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.protobufs.FieldCollapse;