[GRPC] Bump org.opensearch:protobufs to 0.18.0 and fix compilation errors (opensearch-project#19447)

* upgrade to protobufs 0.18.0

Signed-off-by: Karen X <[email protected]>

* add tests

Signed-off-by: Karen X <[email protected]>

---------

Signed-off-by: Karen X <[email protected]>

Author: karenyrx

CHANGELOG.md

@@ -49,6 +49,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add failureaccess as runtime dependency to transport-grpc module  ([#19339](https://github.com/opensearch-project/OpenSearch/pull/19339))
 - Migrate usages of deprecated `Operations#union` from Lucene ([#19397](https://github.com/opensearch-project/OpenSearch/pull/19397))
 - Delegate primitive write methods with ByteSizeCachingDirectory wrapped IndexOutput ([#19432](https://github.com/opensearch-project/OpenSearch/pull/19432))
+- Bump opensearch-protobufs dependency to 0.18.0 and update transport-grpc module compatibility ([#19447](https://github.com/opensearch-project/OpenSearch/issues/19447))
 
 ### Fixed
 - Fix unnecessary refreshes on update preparation failures ([#15261](https://github.com/opensearch-project/OpenSearch/issues/15261))

gradle/libs.versions.toml

@@ -22,7 +22,7 @@ kotlin            = "1.7.10"
 antlr4            = "4.13.1"
 guava             = "33.2.1-jre"
 gson              = "2.13.2"
-opensearchprotobufs = "0.13.0"
+opensearchprotobufs = "0.18.0"
 protobuf          = "3.25.8"
 jakarta_annotation = "1.3.5"
 google_http_client = "1.44.1"

modules/transport-grpc/licenses/protobufs-0.13.0.jar.sha1

@@ -0,0 +1 @@
+e8dc93c60df892184d7c2010e1bd4f15a777c292

modules/transport-grpc/licenses/protobufs-0.18.0.jar.sha1

@@ -0,0 +1 @@
+e8dc93c60df892184d7c2010e1bd4f15a777c292

modules/transport-grpc/spi/licenses/protobufs-0.13.0.jar.sha1

@@ -99,9 +99,7 @@ private QueryContainer createMockTermQueryContainer() {
      * Helper method to create a mock range query container
      */
     private QueryContainer createMockRangeQueryContainer() {
-        return QueryContainer.newBuilder()
-            .setRange(org.opensearch.protobufs.RangeQuery.newBuilder().setField("range_field").build())
-            .build();
+        return QueryContainer.newBuilder().setRange(org.opensearch.protobufs.RangeQuery.newBuilder().build()).build();
     }
 
     /**

modules/transport-grpc/spi/licenses/protobufs-0.18.0.jar.sha1

@@ -45,8 +45,8 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
         // Set up source context if source parameters are provided
         if (request.hasXSource()) {
             switch (request.getXSource().getSourceConfigParamCase()) {
-                case BOOL_VALUE:
-                    fetchSource = request.getXSource().getBoolValue();
+                case BOOL:
+                    fetchSource = request.getXSource().getBool();
                     break;
                 case STRING_ARRAY:
                     sourceIncludes = request.getXSource().getStringArray().getStringArrayList().toArray(new String[0]);
@@ -84,8 +84,8 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
         if (request.hasXSource()) {
             SourceConfigParam source = request.getXSource();
 
-            if (source.hasBoolValue()) {
-                fetchSource = source.getBoolValue();
+            if (source.hasBool()) {
+                fetchSource = source.getBool();
             } else {
                 sourceIncludes = source.getStringArray().getStringArrayList().toArray(new String[0]);
             }

modules/transport-grpc/spi/src/test/java/org/opensearch/transport/grpc/spi/QueryBuilderProtoConverterTests.java

@@ -47,8 +47,8 @@ public static ActiveShardCount parseProto(WaitForActiveShards waitForActiveShard
                     default:
                         return ActiveShardCount.DEFAULT;
                 }
-            case INT32_VALUE:
-                return ActiveShardCount.from(waitForActiveShards.getInt32Value());
+            case INT32:
+                return ActiveShardCount.from(waitForActiveShards.getInt32());
             case WAITFORACTIVESHARDS_NOT_SET:
             default:
                 return ActiveShardCount.DEFAULT;

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

@@ -8,10 +8,12 @@
 package org.opensearch.transport.grpc.proto.request.search;
 
 import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.index.query.InnerHitBuilder;
 import org.opensearch.protobufs.FieldCollapse;
 import org.opensearch.search.collapse.CollapseBuilder;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * Utility class for converting CollapseBuilder Protocol Buffers to OpenSearch objects.
@@ -43,7 +45,8 @@ protected static CollapseBuilder fromProto(FieldCollapse collapseProto) throws I
             collapseBuilder.setMaxConcurrentGroupRequests(collapseProto.getMaxConcurrentGroupSearches());
         }
         if (collapseProto.getInnerHitsCount() > 0) {
-            collapseBuilder.setInnerHits(InnerHitsBuilderProtoUtils.fromProto(collapseProto.getInnerHitsList()));
+            List<InnerHitBuilder> innerHitBuilders = InnerHitsBuilderProtoUtils.fromProto(collapseProto.getInnerHitsList());
+            collapseBuilder.setInnerHits(innerHitBuilders);
         }
 
         return collapseBuilder;