Skip to content

Commit eae0332

Browse files
committed
Use proto 0.8.0 and remove extra loadExternalConverters()
1 parent 7aeb8db commit eae0332

File tree

2 files changed

+5
-29
lines changed

2 files changed

+5
-29
lines changed

modules/transport-grpc/spi/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ base {
1616

1717
dependencies {
1818
api project(":server")
19-
api "org.opensearch:protobufs:0.6.0"
19+
api "org.opensearch:protobufs:0.8.0"
2020
}
2121

2222
// no tests...yet?

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

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
import org.opensearch.protobufs.QueryContainer;
1616

1717
import java.util.HashMap;
18-
import java.util.Iterator;
1918
import java.util.Map;
20-
import java.util.ServiceLoader;
2119

2220
/**
2321
* Registry for QueryBuilderProtoConverter implementations.
@@ -30,38 +28,16 @@ public class QueryBuilderProtoConverterSpiRegistry {
3028
private final Map<QueryContainer.QueryContainerCase, QueryBuilderProtoConverter> converterMap = new HashMap<>();
3129

3230
/**
33-
* Creates a new registry and loads all available converters.
31+
* Creates a new registry. External converters will be registered
32+
* via the OpenSearch ExtensiblePlugin mechanism.
3433
*/
3534
@Inject
3635
public QueryBuilderProtoConverterSpiRegistry() {
37-
// Discover converters from plugins using Java's ServiceLoader
38-
loadExternalConverters();
36+
// External converters are loaded via OpenSearch's ExtensiblePlugin mechanism
37+
// and registered manually via registerConverter() calls
3938
}
4039

41-
/**
42-
* Loads external converters using Java's ServiceLoader mechanism.
43-
* Protected for testing purposes.
44-
*/
45-
protected void loadExternalConverters() {
46-
ServiceLoader<QueryBuilderProtoConverter> serviceLoader = ServiceLoader.load(QueryBuilderProtoConverter.class);
47-
Iterator<QueryBuilderProtoConverter> iterator = serviceLoader.iterator();
48-
49-
int count = 0;
50-
int failedCount = 0;
51-
while (iterator.hasNext()) {
52-
try {
53-
QueryBuilderProtoConverter converter = iterator.next();
54-
registerConverter(converter);
55-
count++;
56-
logger.info("Loaded external query converter for {}: {}", converter.getHandledQueryCase(), converter.getClass().getName());
57-
} catch (Exception e) {
58-
failedCount++;
59-
logger.error("Failed to load external query converter", e);
60-
}
61-
}
6240

63-
logger.info("Loaded {} external query converters ({} failed)", count, failedCount);
64-
}
6541

6642
/**
6743
* Converts a protobuf query container to an OpenSearch QueryBuilder.

0 commit comments

Comments
 (0)