honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix IntelliJ query builder type inference issues 

Relates #15429
This commit is contained in:
Jason Tedor 2016-02-24 02:23:16 -08:00
parent 5a91ad1115
commit 7140d184ab
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/elasticsearch/search/SearchModule.java
View File

@ -33,6 +33,7 @@ import org.elasticsearch.common.geo.builders.PolygonBuilder;
import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.geo.builders.ShapeBuilder;
import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.AbstractModule;
import org.elasticsearch.common.inject.multibindings.Multibinder; import org.elasticsearch.common.inject.multibindings.Multibinder;
import org.elasticsearch.common.io.stream.NamedWriteable;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.query.BoolQueryParser; import org.elasticsearch.index.query.BoolQueryParser;
@ -283,14 +284,15 @@ public class SearchModule extends AbstractModule {
/** /**
* Register a new ScoreFunctionParser. * Register a new ScoreFunctionParser.
*/ */
public void registerFunctionScoreParser(ScoreFunctionParser<?> parser) { public void registerFunctionScoreParser(ScoreFunctionParser<? extends ScoreFunctionBuilder> parser) {
for (String name: parser.getNames()) { for (String name: parser.getNames()) {
Object oldValue = functionScoreParsers.putIfAbsent(name, parser); Object oldValue = functionScoreParsers.putIfAbsent(name, parser);
if (oldValue != null) { if (oldValue != null) {
throw new IllegalArgumentException("Function score parser [" + oldValue + "] already registered for name [" + name + "]"); throw new IllegalArgumentException("Function score parser [" + oldValue + "] already registered for name [" + name + "]");
} }
} }
namedWriteableRegistry.registerPrototype(ScoreFunctionBuilder.class, parser.getBuilderPrototype()); @SuppressWarnings("unchecked") NamedWriteable<? extends ScoreFunctionBuilder> sfb = parser.getBuilderPrototype();
namedWriteableRegistry.registerPrototype(ScoreFunctionBuilder.class, sfb);
} }
public void registerQueryParser(Supplier<QueryParser<?>> parser) { public void registerQueryParser(Supplier<QueryParser<?>> parser) {
@ -354,14 +356,15 @@ public class SearchModule extends AbstractModule {
public IndicesQueriesRegistry buildQueryParserRegistry() { public IndicesQueriesRegistry buildQueryParserRegistry() {
Map<String, QueryParser<?>> queryParsersMap = new HashMap<>(); Map<String, QueryParser<?>> queryParsersMap = new HashMap<>();
for (Supplier<QueryParser<?>> parserSupplier : queryParsers) { for (Supplier<QueryParser<?>> parserSupplier : queryParsers) {
QueryParser<?> parser = parserSupplier.get(); QueryParser<? extends QueryBuilder> parser = parserSupplier.get();
for (String name: parser.names()) { for (String name: parser.names()) {
Object oldValue = queryParsersMap.putIfAbsent(name, parser); Object oldValue = queryParsersMap.putIfAbsent(name, parser);
if (oldValue != null) { if (oldValue != null) {
throw new IllegalArgumentException("Query parser [" + oldValue + "] already registered for name [" + name + "] while trying to register [" + parser + "]"); throw new IllegalArgumentException("Query parser [" + oldValue + "] already registered for name [" + name + "] while trying to register [" + parser + "]");
} }
} }
namedWriteableRegistry.registerPrototype(QueryBuilder.class, parser.getBuilderPrototype()); @SuppressWarnings("unchecked") NamedWriteable<? extends QueryBuilder> qb = parser.getBuilderPrototype();
namedWriteableRegistry.registerPrototype(QueryBuilder.class, qb);
} }
return new IndicesQueriesRegistry(settings, queryParsersMap); return new IndicesQueriesRegistry(settings, queryParsersMap);
} }