move to use guice to register also the default query parsers and filters

elastic · Sep 12, 2010 · 77a7938 · 77a7938
1 parent 2442e1f
commit 77a7938
Show file tree

Hide file tree

Showing 16 changed files with 273 additions and 448 deletions.
diff --git a/...les/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java b/...les/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserModule.java
@@ -144,6 +144,7 @@ public void processXContentQueryFilter(String name, Class<? extends XContentFilt
 
     public IndexQueryParserModule(Settings settings) {
         this.settings = settings;
+        this.processors.add(new DefaultQueryProcessors());
     }
 
     public IndexQueryParserModule addProcessor(QueryParsersProcessor processor) {
@@ -216,4 +217,50 @@ public IndexQueryParserModule addProcessor(QueryParsersProcessor processor) {
 
         bind(IndexQueryParserService.class).asEagerSingleton();
     }
+
+    private static class DefaultQueryProcessors extends QueryParsersProcessor {
+        @Override public void processXContentQueryParsers(XContentQueryParsersBindings bindings) {
+            bindings.processXContentQueryParser(DisMaxQueryParser.NAME, DisMaxQueryParser.class);
+            bindings.processXContentQueryParser(MatchAllQueryParser.NAME, MatchAllQueryParser.class);
+            bindings.processXContentQueryParser(QueryStringQueryParser.NAME, QueryStringQueryParser.class);
+            bindings.processXContentQueryParser(BoolQueryParser.NAME, BoolQueryParser.class);
+            bindings.processXContentQueryParser(TermQueryParser.NAME, TermQueryParser.class);
+            bindings.processXContentQueryParser(FuzzyQueryParser.NAME, FuzzyQueryParser.class);
+            bindings.processXContentQueryParser(FieldQueryParser.NAME, FieldQueryParser.class);
+            bindings.processXContentQueryParser(RangeQueryParser.NAME, RangeQueryParser.class);
+            bindings.processXContentQueryParser(PrefixQueryParser.NAME, PrefixQueryParser.class);
+            bindings.processXContentQueryParser(WildcardQueryParser.NAME, WildcardQueryParser.class);
+            bindings.processXContentQueryParser(FilteredQueryParser.NAME, FilteredQueryParser.class);
+            bindings.processXContentQueryParser(ConstantScoreQueryParser.NAME, ConstantScoreQueryParser.class);
+            bindings.processXContentQueryParser(CustomBoostFactorQueryParser.NAME, CustomBoostFactorQueryParser.class);
+            bindings.processXContentQueryParser(CustomScoreQueryParser.NAME, CustomScoreQueryParser.class);
+            bindings.processXContentQueryParser(SpanTermQueryParser.NAME, SpanTermQueryParser.class);
+            bindings.processXContentQueryParser(SpanNotQueryParser.NAME, SpanNotQueryParser.class);
+            bindings.processXContentQueryParser(SpanFirstQueryParser.NAME, SpanFirstQueryParser.class);
+            bindings.processXContentQueryParser(SpanNearQueryParser.NAME, SpanNearQueryParser.class);
+            bindings.processXContentQueryParser(SpanOrQueryParser.NAME, SpanOrQueryParser.class);
+            bindings.processXContentQueryParser(MoreLikeThisQueryParser.NAME, MoreLikeThisQueryParser.class);
+            bindings.processXContentQueryParser(MoreLikeThisFieldQueryParser.NAME, MoreLikeThisFieldQueryParser.class);
+            bindings.processXContentQueryParser(FuzzyLikeThisQueryParser.NAME, FuzzyLikeThisQueryParser.class);
+            bindings.processXContentQueryParser(FuzzyLikeThisFieldQueryParser.NAME, FuzzyLikeThisFieldQueryParser.class);
+        }
+
+        @Override public void processXContentFilterParsers(XContentFilterParsersBindings bindings) {
+            bindings.processXContentQueryFilter(TermFilterParser.NAME, TermFilterParser.class);
+            bindings.processXContentQueryFilter(TermsFilterParser.NAME, TermsFilterParser.class);
+            bindings.processXContentQueryFilter(RangeFilterParser.NAME, RangeFilterParser.class);
+            bindings.processXContentQueryFilter(PrefixFilterParser.NAME, PrefixFilterParser.class);
+            bindings.processXContentQueryFilter(ScriptFilterParser.NAME, ScriptFilterParser.class);
+            bindings.processXContentQueryFilter(GeoDistanceFilterParser.NAME, GeoDistanceFilterParser.class);
+            bindings.processXContentQueryFilter(GeoBoundingBoxFilterParser.NAME, GeoBoundingBoxFilterParser.class);
+            bindings.processXContentQueryFilter(GeoPolygonFilterParser.NAME, GeoPolygonFilterParser.class);
+            bindings.processXContentQueryFilter(QueryFilterParser.NAME, QueryFilterParser.class);
+            bindings.processXContentQueryFilter(FQueryFilterParser.NAME, FQueryFilterParser.class);
+            bindings.processXContentQueryFilter(BoolFilterParser.NAME, BoolFilterParser.class);
+            bindings.processXContentQueryFilter(AndFilterParser.NAME, AndFilterParser.class);
+            bindings.processXContentQueryFilter(OrFilterParser.NAME, OrFilterParser.class);
+            bindings.processXContentQueryFilter(NotFilterParser.NAME, NotFilterParser.class);
+            bindings.processXContentQueryFilter(MatchAllFilterParser.NAME, MatchAllFilterParser.class);
+        }
+    }
 }
diff --git a/...es/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java b/...es/elasticsearch/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java
@@ -24,14 +24,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.analysis.AnalysisService;
-import org.elasticsearch.index.cache.IndexCache;
-import org.elasticsearch.index.engine.IndexEngine;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.query.xcontent.XContentIndexQueryParser;
 import org.elasticsearch.index.settings.IndexSettings;
-import org.elasticsearch.index.similarity.SimilarityService;
-import org.elasticsearch.script.ScriptService;
 
 import javax.annotation.Nullable;
 import java.util.Map;
@@ -53,15 +46,7 @@ public static final class Defaults {
 
     private final Map<String, IndexQueryParser> indexQueryParsers;
 
-    public IndexQueryParserService(Index index, MapperService mapperService, IndexCache indexCache, IndexEngine indexEngine, AnalysisService analysisService) {
-        this(index, EMPTY_SETTINGS, new ScriptService(EMPTY_SETTINGS), mapperService, indexCache, indexEngine, analysisService, null, null);
-    }
-
     @Inject public IndexQueryParserService(Index index, @IndexSettings Settings indexSettings,
-                                           ScriptService scriptService,
-                                           MapperService mapperService, IndexCache indexCache,
-                                           IndexEngine indexEngine, AnalysisService analysisService,
-                                           @Nullable SimilarityService similarityService,
                                            @Nullable Map<String, IndexQueryParserFactory> indexQueryParsersFactories) {
         super(index, indexSettings);
         Map<String, Settings> queryParserGroupSettings;
@@ -81,11 +66,6 @@ public IndexQueryParserService(Index index, MapperService mapperService, IndexCa
                 qparsers.put(qparserName, entry.getValue().create(qparserName, qparserSettings));
             }
         }
-        if (!qparsers.containsKey(Defaults.DEFAULT)) {
-            IndexQueryParser defaultQueryParser = new XContentIndexQueryParser(index, indexSettings, scriptService, mapperService, indexCache, indexEngine, analysisService, similarityService, null, null, Defaults.DEFAULT, null);
-            qparsers.put(Defaults.DEFAULT, defaultQueryParser);
-        }
-
         indexQueryParsers = ImmutableMap.copyOf(qparsers);
 
         defaultIndexQueryParser = indexQueryParser(Defaults.DEFAULT);

diff --git a/.../elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolFilterParser.java b/.../elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolFilterParser.java
@@ -38,12 +38,14 @@
  */
 public class BoolFilterParser extends AbstractIndexComponent implements XContentFilterParser {
 
+    public static final String NAME = "bool";
+
     @Inject public BoolFilterParser(Index index, @IndexSettings Settings settings) {
         super(index, settings);
     }
 
     @Override public String[] names() {
-        return new String[]{"bool"};
+        return new String[]{NAME};
     }
 
     @Override public Filter parse(QueryParseContext parseContext) throws IOException, QueryParsingException {

diff --git a/...s/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java b/...s/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/BoolQueryParser.java
@@ -41,12 +41,14 @@
  */
 public class BoolQueryParser extends AbstractIndexComponent implements XContentQueryParser {
 
+    public static final String NAME = "bool";
+
     @Inject public BoolQueryParser(Index index, @IndexSettings Settings settings) {
         super(index, settings);
     }
 
     @Override public String[] names() {
-        return new String[]{"bool"};
+        return new String[]{NAME};
     }
 
     @Override public Query parse(QueryParseContext parseContext) throws IOException, QueryParsingException {

diff --git a/...h/src/main/java/org/elasticsearch/index/query/xcontent/FuzzyLikeThisFieldQueryParser.java b/...h/src/main/java/org/elasticsearch/index/query/xcontent/FuzzyLikeThisFieldQueryParser.java
@@ -23,6 +23,7 @@
 import org.apache.lucene.search.FuzzyLikeThisQuery;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.AbstractIndexComponent;
@@ -53,7 +54,7 @@ public class FuzzyLikeThisFieldQueryParser extends AbstractIndexComponent implem
 
     public static final String NAME = "flt_field";
 
-    public FuzzyLikeThisFieldQueryParser(Index index, @IndexSettings Settings indexSettings) {
+    @Inject public FuzzyLikeThisFieldQueryParser(Index index, @IndexSettings Settings indexSettings) {
         super(index, indexSettings);
     }
 

diff --git a/...search/src/main/java/org/elasticsearch/index/query/xcontent/FuzzyLikeThisQueryParser.java b/...search/src/main/java/org/elasticsearch/index/query/xcontent/FuzzyLikeThisQueryParser.java
@@ -22,6 +22,7 @@
 import org.apache.lucene.search.FuzzyLikeThisQuery;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.collect.Lists;
+import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.AbstractIndexComponent;
@@ -51,7 +52,7 @@ public class FuzzyLikeThisQueryParser extends AbstractIndexComponent implements
 
     public static final String NAME = "flt";
 
-    public FuzzyLikeThisQueryParser(Index index, @IndexSettings Settings indexSettings) {
+    @Inject public FuzzyLikeThisQueryParser(Index index, @IndexSettings Settings indexSettings) {
         super(index, indexSettings);
     }
 

diff --git a/.../elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FuzzyQueryParser.java b/.../elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FuzzyQueryParser.java
@@ -22,6 +22,7 @@
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.Query;
+import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.AbstractIndexComponent;
@@ -41,7 +42,7 @@ public class FuzzyQueryParser extends AbstractIndexComponent implements XContent
 
     public static final String NAME = "fuzzy";
 
-    public FuzzyQueryParser(Index index, @IndexSettings Settings indexSettings) {
+    @Inject public FuzzyQueryParser(Index index, @IndexSettings Settings indexSettings) {
         super(index, indexSettings);
     }
 

diff --git a/...ch/src/main/java/org/elasticsearch/index/query/xcontent/MoreLikeThisFieldQueryParser.java b/...ch/src/main/java/org/elasticsearch/index/query/xcontent/MoreLikeThisFieldQueryParser.java
@@ -22,6 +22,7 @@
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.Sets;
+import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.search.MoreLikeThisQuery;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -43,7 +44,7 @@ public class MoreLikeThisFieldQueryParser extends AbstractIndexComponent impleme
 
     public static final String NAME = "mlt_field";
 
-    public MoreLikeThisFieldQueryParser(Index index, @IndexSettings Settings indexSettings) {
+    @Inject public MoreLikeThisFieldQueryParser(Index index, @IndexSettings Settings indexSettings) {
         super(index, indexSettings);
     }
 

diff --git a/...csearch/src/main/java/org/elasticsearch/index/query/xcontent/MoreLikeThisQueryParser.java b/...csearch/src/main/java/org/elasticsearch/index/query/xcontent/MoreLikeThisQueryParser.java
@@ -22,6 +22,7 @@
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.collect.Lists;
 import org.elasticsearch.common.collect.Sets;
+import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.search.MoreLikeThisQuery;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -42,7 +43,7 @@ public class MoreLikeThisQueryParser extends AbstractIndexComponent implements X
 
     public static final String NAME = "mlt";
 
-    public MoreLikeThisQueryParser(Index index, @IndexSettings Settings indexSettings) {
+    @Inject public MoreLikeThisQueryParser(Index index, @IndexSettings Settings indexSettings) {
         super(index, indexSettings);
     }
 

diff --git a/...elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryParseContext.java b/...elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/QueryParseContext.java
@@ -50,17 +50,7 @@ public class QueryParseContext {
 
     private final Index index;
 
-    private final ScriptService scriptService;
-
-    private final MapperService mapperService;
-
-    private final SimilarityService similarityService;
-
-    private final IndexCache indexCache;
-
-    private final IndexEngine indexEngine;
-
-    private final XContentQueryParserRegistry queryParserRegistry;
+    XContentIndexQueryParser indexQueryParser;
 
     private final Map<String, Filter> namedFilters = Maps.newHashMap();
 
@@ -70,17 +60,9 @@ public class QueryParseContext {
 
     private XContentParser parser;
 
-    public QueryParseContext(Index index, XContentQueryParserRegistry queryParserRegistry,
-                             ScriptService scriptService,
-                             MapperService mapperService, SimilarityService similarityService,
-                             IndexCache indexCache, IndexEngine indexEngine) {
+    public QueryParseContext(Index index, XContentIndexQueryParser indexQueryParser) {
         this.index = index;
-        this.queryParserRegistry = queryParserRegistry;
-        this.scriptService = scriptService;
-        this.mapperService = mapperService;
-        this.similarityService = similarityService;
-        this.indexCache = indexCache;
-        this.indexEngine = indexEngine;
+        this.indexQueryParser = indexQueryParser;
     }
 
     public void reset(XContentParser jp) {
@@ -93,27 +75,27 @@ public XContentParser parser() {
     }
 
     public ScriptService scriptService() {
-        return scriptService;
+        return indexQueryParser.scriptService;
     }
 
     public MapperService mapperService() {
-        return mapperService;
+        return indexQueryParser.mapperService;
     }
 
     public IndexEngine indexEngine() {
-        return this.indexEngine;
+        return indexQueryParser.indexEngine;
     }
 
     @Nullable public SimilarityService similarityService() {
-        return this.similarityService;
+        return indexQueryParser.similarityService;
     }
 
     public Similarity searchSimilarity() {
-        return similarityService != null ? similarityService.defaultSearchSimilarity() : null;
+        return indexQueryParser.similarityService != null ? indexQueryParser.similarityService.defaultSearchSimilarity() : null;
     }
 
     public IndexCache indexCache() {
-        return indexCache;
+        return indexQueryParser.indexCache;
     }
 
     public MapperQueryParser queryParser(QueryParserSettings settings) {
@@ -127,7 +109,7 @@ public MultiFieldMapperQueryParser queryParser(MultiFieldQueryParserSettings set
     }
 
     public Filter cacheFilterIfPossible(Filter filter) {
-        return indexCache.filter().cache(filter);
+        return indexQueryParser.indexCache.filter().cache(filter);
     }
 
     public void addNamedFilter(String name, Filter filter) {
@@ -155,7 +137,7 @@ public Query parseInnerQuery() throws IOException, QueryParsingException {
         token = parser.nextToken();
         assert token == XContentParser.Token.START_OBJECT || token == XContentParser.Token.START_ARRAY;
 
-        XContentQueryParser queryParser = queryParserRegistry.queryParser(queryName);
+        XContentQueryParser queryParser = indexQueryParser.queryParser(queryName);
         if (queryParser == null) {
             throw new QueryParsingException(index, "No query parser registered for [" + queryName + "]");
         }
@@ -181,7 +163,7 @@ public Filter parseInnerFilter() throws IOException, QueryParsingException {
         token = parser.nextToken();
         assert token == XContentParser.Token.START_OBJECT || token == XContentParser.Token.START_ARRAY;
 
-        XContentFilterParser filterParser = queryParserRegistry.filterParser(queryName);
+        XContentFilterParser filterParser = indexQueryParser.filterParser(queryName);
         if (filterParser == null) {
             throw new QueryParsingException(index, "No query parser registered for [" + queryName + "]");
         }
@@ -194,7 +176,7 @@ public Filter parseInnerFilter() throws IOException, QueryParsingException {
     }
 
     public FieldMapper fieldMapper(String name) {
-        FieldMappers fieldMappers = mapperService.smartNameFieldMappers(name);
+        FieldMappers fieldMappers = indexQueryParser.mapperService.smartNameFieldMappers(name);
         if (fieldMappers == null) {
             return null;
         }
@@ -210,6 +192,6 @@ public String indexName(String name) {
     }
 
     public MapperService.SmartNameFieldMappers smartFieldMappers(String name) {
-        return mapperService.smartName(name);
+        return indexQueryParser.mapperService.smartName(name);
     }
 }