Use proto 0.8.0 and remove extra loadExternalConverters()

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

Author: karenyrx

modules/transport-grpc/spi/build.gradle

@@ -16,7 +16,7 @@ base {
 
 dependencies {
   api project(":server")
-  api "org.opensearch:protobufs:0.6.0"
+  api "org.opensearch:protobufs:0.8.0"
 }
 
 // no tests...yet?

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

@@ -0,0 +1 @@
+6759aa64855c3d6d61a9cd52ad8afd73f01d8a11

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

@@ -15,9 +15,7 @@
 import org.opensearch.protobufs.QueryContainer;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.ServiceLoader;
 
 /**
  * Registry for QueryBuilderProtoConverter implementations.
@@ -30,37 +28,13 @@ public class QueryBuilderProtoConverterSpiRegistry {
     private final Map<QueryContainer.QueryContainerCase, QueryBuilderProtoConverter> converterMap = new HashMap<>();
 
     /**
-     * Creates a new registry and loads all available converters.
+     * Creates a new registry. External converters will be registered
+     * via the OpenSearch ExtensiblePlugin mechanism.
      */
     @Inject
     public QueryBuilderProtoConverterSpiRegistry() {
-        // Discover converters from plugins using Java's ServiceLoader
-        loadExternalConverters();
-    }
-
-    /**
-     * Loads external converters using Java's ServiceLoader mechanism.
-     * Protected for testing purposes.
-     */
-    protected void loadExternalConverters() {
-        ServiceLoader<QueryBuilderProtoConverter> serviceLoader = ServiceLoader.load(QueryBuilderProtoConverter.class);
-        Iterator<QueryBuilderProtoConverter> iterator = serviceLoader.iterator();
-
-        int count = 0;
-        int failedCount = 0;
-        while (iterator.hasNext()) {
-            try {
-                QueryBuilderProtoConverter converter = iterator.next();
-                registerConverter(converter);
-                count++;
-                logger.info("Loaded external query converter for {}: {}", converter.getHandledQueryCase(), converter.getClass().getName());
-            } catch (Exception e) {
-                failedCount++;
-                logger.error("Failed to load external query converter", e);
-            }
-        }
-
-        logger.info("Loaded {} external query converters ({} failed)", count, failedCount);
+        // External converters are loaded via OpenSearch's ExtensiblePlugin mechanism
+        // and registered manually via registerConverter() calls
     }
 
     /**

modules/transport-grpc/spi/src/main/java/org/opensearch/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterSpiRegistry.java

@@ -47,7 +47,7 @@ public final static class Builder {
         private ExecutorService executorService;
         private Class<? extends io.netty.channel.Channel> channelType;
         private SslContext sslContext;
-        
+
         private Builder() {}
 
         Builder(BufferAllocator allocator, Location location) {
@@ -131,7 +131,7 @@ public FlightClient build() {
                             builder.channelType(
                                 Class.forName("io.netty.channel.epoll.EpollDomainSocketChannel")
                                     .asSubclass(ServerChannel.class));
-                            final EventLoopGroup elg =  
+                            final EventLoopGroup elg =
                                 Class.forName("io.netty.channel.epoll.EpollEventLoopGroup")
                                     .asSubclass(EventLoopGroup.class)
                                     .getDeclaredConstructor()
@@ -142,7 +142,7 @@ public FlightClient build() {
                             builder.channelType(
                                 Class.forName("io.netty.channel.kqueue.KQueueDomainSocketChannel")
                                     .asSubclass(ServerChannel.class));
-                            final EventLoopGroup elg =  
+                            final EventLoopGroup elg =
                                 Class.forName("io.netty.channel.kqueue.KQueueEventLoopGroup")
                                     .asSubclass(EventLoopGroup.class)
                                     .getDeclaredConstructor()
@@ -179,7 +179,7 @@ public FlightClient build() {
                     builder.sslContext(sslContext);
                 } else {
                     final SslContextBuilder sslContextBuilder = GrpcSslContexts.forClient();
-    
+
                     if (!this.verifyServer) {
                         sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE);
                     } else if (this.trustedCertificates != null
@@ -215,11 +215,11 @@ public FlightClient build() {
             if (channelType != null) {
                 builder.channelType(channelType);
             }
- 
+
             if (workerELG != null) {
                 builder.eventLoopGroup(workerELG);
             }
- 
+
             return new FlightClient(allocator, builder.build(), middleware);
         }
 
@@ -232,7 +232,7 @@ public Builder channelType(Class<? extends io.netty.channel.Channel> channelType
             this.channelType = channelType;
             return this;
         }
-        
+
         public Builder eventLoopGroup(EventLoopGroup workerELG) {
             this.workerELG = workerELG;
             return this;