remove registry from SPI

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

Author: karenyrx

modules/transport-grpc/spi/README.md

@@ -22,9 +22,9 @@ public interface QueryBuilderProtoConverter {
 }
 ```
 
-### QueryBuilderProtoConverterSpiRegistry
+### QueryBuilderProtoConverterRegistry
 
-Registry that manages and discovers all available query converters. External plugins can register their custom converters through this registry.
+Interface for accessing the query converter registry. This provides a clean abstraction for plugins that need to convert nested queries without exposing internal implementation details.
 
 ## Usage for Plugin Developers
 

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

@@ -9,14 +9,22 @@
 /**
  * Service Provider Interface (SPI) for extending gRPC transport query conversion capabilities.
  * <p>
- * This package provides the core interfaces and registry for implementing custom query converters
+ * This package provides a minimal, stable API for implementing custom query converters
  * that can transform protobuf query messages into OpenSearch QueryBuilder objects. External plugins
  * can implement the {@link org.opensearch.transport.grpc.spi.QueryBuilderProtoConverter} interface
  * to add support for custom query types in gRPC requests.
  * </p>
  * <p>
- * The SPI mechanism leverages OpenSearch's {@code ExtensiblePlugin} framework, which internally
- * uses Java's {@code ServiceLoader} for discovery. Plugins must:
+ * The SPI contains only two interfaces:
+ * </p>
+ * <ul>
+ *   <li>{@link org.opensearch.transport.grpc.spi.QueryBuilderProtoConverter} -
+ *       Interface for implementing custom query converters</li>
+ *   <li>{@link org.opensearch.transport.grpc.spi.QueryBuilderProtoConverterRegistry} -
+ *       Interface for accessing the registry to convert nested queries</li>
+ * </ul>
+ * <p>
+ * The SPI mechanism leverages OpenSearch's {@code ExtensiblePlugin} framework. Plugins must:
  * </p>
  * <ul>
  *   <li>Implement {@link org.opensearch.transport.grpc.spi.QueryBuilderProtoConverter}</li>

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

@@ -15,7 +15,6 @@
 import org.opensearch.protobufs.QueryContainer;
 import org.opensearch.transport.grpc.spi.QueryBuilderProtoConverter;
 import org.opensearch.transport.grpc.spi.QueryBuilderProtoConverterRegistry;
-import org.opensearch.transport.grpc.spi.QueryBuilderProtoConverterSpiRegistry;
 
 /**
  * Registry for QueryBuilderProtoConverter implementations.

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

@@ -5,14 +5,15 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.transport.grpc.spi;
+package org.opensearch.transport.grpc.proto.request.search.query;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.inject.Singleton;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.protobufs.QueryContainer;
+import org.opensearch.transport.grpc.spi.QueryBuilderProtoConverter;
 
 import java.util.HashMap;
 import java.util.Map;

modules/transport-grpc/spi/src/test/java/org/opensearch/transport/grpc/spi/QueryBuilderProtoConverterSpiRegistryTests.java renamed to modules/transport-grpc/src/test/java/org/opensearch/transport/grpc/proto/request/search/query/QueryBuilderProtoConverterSpiRegistryTests.java

@@ -5,12 +5,13 @@
  * this file be licensed under the Apache-2.0 license or a
  * compatible open source license.
  */
-package org.opensearch.transport.grpc.spi;
+package org.opensearch.transport.grpc.proto.request.search.query;
 
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.TermQueryBuilder;
 import org.opensearch.protobufs.QueryContainer;
 import org.opensearch.test.OpenSearchTestCase;
+import org.opensearch.transport.grpc.spi.QueryBuilderProtoConverter;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;