SOLR-8597: add default, no-op QParserPlugin.init(NamedList) method

This commit is contained in:
Christine Poerschke 2016-01-28 17:39:52 +00:00
parent 62c9b6a172
commit 9754da625c
33 changed files with 5 additions and 126 deletions

View File

@ -40,10 +40,6 @@ public class BoostQParserPlugin extends QParserPlugin {
public static final String NAME = "boost"; public static final String NAME = "boost";
public static String BOOSTFUNC = "b"; public static String BOOSTFUNC = "b";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -122,10 +122,6 @@ public class CollapsingQParserPlugin extends QParserPlugin {
public static final String HINT_MULTI_DOCVALUES = "multi_docvalues"; public static final String HINT_MULTI_DOCVALUES = "multi_docvalues";
public void init(NamedList namedList) {
}
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest request) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest request) {
return new CollapsingQParser(qstr, localParams, params, request); return new CollapsingQParser(qstr, localParams, params, request);
} }

View File

@ -40,6 +40,7 @@ public class ComplexPhraseQParserPlugin extends QParserPlugin {
@Override @Override
public void init(NamedList args) { public void init(NamedList args) {
super.init(args);
if (args != null) { if (args != null) {
Object val = args.get("inOrder"); Object val = args.get("inOrder");
if (val != null) { if (val != null) {

View File

@ -112,10 +112,6 @@ import org.apache.solr.request.SolrQueryRequest;
public class DisMaxQParserPlugin extends QParserPlugin { public class DisMaxQParserPlugin extends QParserPlugin {
public static final String NAME = "dismax"; public static final String NAME = "dismax";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new DisMaxQParser(qstr, localParams, params, req); return new DisMaxQParser(qstr, localParams, params, req);

View File

@ -34,9 +34,6 @@ public class ExportQParserPlugin extends QParserPlugin {
public static final String NAME = "xport"; public static final String NAME = "xport";
public void init(NamedList namedList) {
}
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest request) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest request) {
return new ExportQParser(qstr, localParams, params, request); return new ExportQParser(qstr, localParams, params, request);
} }

View File

@ -28,10 +28,6 @@ import org.apache.solr.request.SolrQueryRequest;
public class ExtendedDismaxQParserPlugin extends QParserPlugin { public class ExtendedDismaxQParserPlugin extends QParserPlugin {
public static final String NAME = "edismax"; public static final String NAME = "edismax";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new ExtendedDismaxQParser(qstr, localParams, params, req); return new ExtendedDismaxQParser(qstr, localParams, params, req);

View File

@ -34,10 +34,6 @@ import org.apache.solr.schema.SchemaField;
public class FieldQParserPlugin extends QParserPlugin { public class FieldQParserPlugin extends QParserPlugin {
public static final String NAME = "field"; public static final String NAME = "field";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -28,10 +28,6 @@ import org.apache.solr.request.SolrQueryRequest;
public class FunctionQParserPlugin extends QParserPlugin { public class FunctionQParserPlugin extends QParserPlugin {
public static final String NAME = "func"; public static final String NAME = "func";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new FunctionQParser(qstr, localParams, params, req); return new FunctionQParser(qstr, localParams, params, req);

View File

@ -38,10 +38,6 @@ import org.apache.solr.search.function.*;
public class FunctionRangeQParserPlugin extends QParserPlugin { public class FunctionRangeQParserPlugin extends QParserPlugin {
public static final String NAME = "frange"; public static final String NAME = "frange";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -56,10 +56,6 @@ public class HashQParserPlugin extends QParserPlugin {
public static final String NAME = "hash"; public static final String NAME = "hash";
public void init(NamedList params) {
}
public QParser createParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest request) { public QParser createParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest request) {
return new HashQParser(query, localParams, params, request); return new HashQParser(query, localParams, params, request);
} }

View File

@ -60,10 +60,6 @@ import org.apache.solr.util.RefCounted;
public class JoinQParserPlugin extends QParserPlugin { public class JoinQParserPlugin extends QParserPlugin {
public static final String NAME = "join"; public static final String NAME = "join";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -36,10 +36,6 @@ import java.util.List;
public class LuceneQParserPlugin extends QParserPlugin { public class LuceneQParserPlugin extends QParserPlugin {
public static final String NAME = "lucene"; public static final String NAME = "lucene";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new LuceneQParser(qstr, localParams, params, req); return new LuceneQParser(qstr, localParams, params, req);

View File

@ -34,10 +34,6 @@ import org.apache.solr.request.SolrQueryRequest;
public class NestedQParserPlugin extends QParserPlugin { public class NestedQParserPlugin extends QParserPlugin {
public static final String NAME = "query"; public static final String NAME = "query";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -28,10 +28,6 @@ import org.apache.solr.request.SolrQueryRequest;
public class OldLuceneQParserPlugin extends QParserPlugin { public class OldLuceneQParserPlugin extends QParserPlugin {
public static final String NAME = "lucenePlusSort"; public static final String NAME = "lucenePlusSort";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new OldLuceneQParser(qstr, localParams, params, req); return new OldLuceneQParser(qstr, localParams, params, req);

View File

@ -34,10 +34,6 @@ import org.apache.solr.schema.SchemaField;
public class PrefixQParserPlugin extends QParserPlugin { public class PrefixQParserPlugin extends QParserPlugin {
public static final String NAME = "prefix"; public static final String NAME = "prefix";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -82,6 +82,10 @@ public abstract class QParserPlugin implements NamedListInitializedPlugin, SolrI
/** return a {@link QParser} */ /** return a {@link QParser} */
public abstract QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req); public abstract QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req);
@Override
public void init( NamedList args ) {
}
@Override @Override
public String getName() { public String getName() {
// TODO: ideally use the NAME property that each qparser plugin has // TODO: ideally use the NAME property that each qparser plugin has

View File

@ -36,10 +36,6 @@ import org.apache.solr.request.SolrQueryRequest;
public class RawQParserPlugin extends QParserPlugin { public class RawQParserPlugin extends QParserPlugin {
public static final String NAME = "raw"; public static final String NAME = "raw";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -64,9 +64,6 @@ public class ReRankQParserPlugin extends QParserPlugin {
public static final String NAME = "rerank"; public static final String NAME = "rerank";
private static Query defaultQuery = new MatchAllDocsQuery(); private static Query defaultQuery = new MatchAllDocsQuery();
public void init(NamedList args) {
}
public QParser createParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new ReRankQParser(query, localParams, params, req); return new ReRankQParser(query, localParams, params, req);
} }

View File

@ -91,11 +91,6 @@ public class SimpleQParserPlugin extends QParserPlugin {
OPERATORS.put(SimpleParams.NEAR_OPERATOR, SimpleQueryParser.NEAR_OPERATOR); OPERATORS.put(SimpleParams.NEAR_OPERATOR, SimpleQueryParser.NEAR_OPERATOR);
} }
/** No initialization is necessary so this method is empty. */
@Override
public void init(NamedList args) {
}
/** Returns a QParser that will create a query by using Lucene's SimpleQueryParser. */ /** Returns a QParser that will create a query by using Lucene's SimpleQueryParser. */
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {

View File

@ -31,9 +31,4 @@ public class SpatialBoxQParserPlugin extends SpatialFilterQParserPlugin {
return new SpatialFilterQParser(qstr, localParams, params, req, true); return new SpatialFilterQParser(qstr, localParams, params, req, true);
} }
@Override
public void init(NamedList args) {
}
} }

View File

@ -56,10 +56,5 @@ public class SpatialFilterQParserPlugin extends QParserPlugin {
return new SpatialFilterQParser(qstr, localParams, params, req, false); return new SpatialFilterQParser(qstr, localParams, params, req, false);
} }
@Override
public void init(NamedList args) {
}
} }

View File

@ -48,10 +48,6 @@ public class SurroundQParserPlugin extends QParserPlugin {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String NAME = "surround"; public static final String NAME = "surround";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, public QParser createParser(String qstr, SolrParams localParams,
SolrParams params, SolrQueryRequest req) { SolrParams params, SolrQueryRequest req) {

View File

@ -151,10 +151,6 @@ public class SwitchQParserPlugin extends QParserPlugin {
*/ */
public static String SWITCH_DEFAULT = "default"; public static String SWITCH_DEFAULT = "default";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -43,10 +43,6 @@ import org.apache.solr.schema.FieldType;
public class TermQParserPlugin extends QParserPlugin { public class TermQParserPlugin extends QParserPlugin {
public static final String NAME = "term"; public static final String NAME = "term";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) { return new QParser(qstr, localParams, params, req) {

View File

@ -58,10 +58,6 @@ public class TermsQParserPlugin extends QParserPlugin {
/** Choose the internal algorithm */ /** Choose the internal algorithm */
private static final String METHOD = "method"; private static final String METHOD = "method";
@Override
public void init(NamedList args) {
}
private static enum Method { private static enum Method {
termsFilter { termsFilter {
@Override @Override

View File

@ -58,10 +58,6 @@ public class XmlQParserPlugin extends QParserPlugin {
} }
@Override
public void init(NamedList args) {
}
public QParser createParser(String qstr, SolrParams localParams, public QParser createParser(String qstr, SolrParams localParams,
SolrParams params, SolrQueryRequest req) { SolrParams params, SolrQueryRequest req) {
return new XmlQParser(qstr, localParams, params, req); return new XmlQParser(qstr, localParams, params, req);

View File

@ -41,9 +41,5 @@ public class BlockJoinParentQParserPlugin extends QParserPlugin {
protected QParser createBJQParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { protected QParser createBJQParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new BlockJoinParentQParser(qstr, localParams, params, req); return new BlockJoinParentQParser(qstr, localParams, params, req);
} }
@Override
public void init(NamedList args) {
}
} }

View File

@ -31,10 +31,6 @@ public class GraphQParserPlugin extends QParserPlugin {
// Graph Query Parser parser name // Graph Query Parser parser name
public static final String NAME = "graph"; public static final String NAME = "graph";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
// return the graph query parser for this request. // return the graph query parser for this request.

View File

@ -206,10 +206,6 @@ public class ScoreJoinQParserPlugin extends QParserPlugin {
} }
} }
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {

View File

@ -28,11 +28,6 @@ import org.apache.solr.search.QParserPlugin;
public class MLTQParserPlugin extends QParserPlugin { public class MLTQParserPlugin extends QParserPlugin {
public static final String NAME = "mlt"; public static final String NAME = "mlt";
@Override
public void init(NamedList args) {
}
@Override @Override
public QParser createParser(String qstr, SolrParams localParams, public QParser createParser(String qstr, SolrParams localParams,
SolrParams params, SolrQueryRequest req) { SolrParams params, SolrQueryRequest req) {

View File

@ -30,10 +30,6 @@ public class FooQParserPlugin extends QParserPlugin {
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new FooQParser(qstr, localParams, params, req); return new FooQParser(qstr, localParams, params, req);
} }
@Override
public void init(NamedList args) {
}
} }
class FooQParser extends QParser { class FooQParser extends QParser {

View File

@ -41,10 +41,6 @@ import java.io.IOException;
public class TestAnalyticsQParserPlugin extends QParserPlugin { public class TestAnalyticsQParserPlugin extends QParserPlugin {
public void init(NamedList params) {
}
public QParser createParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new TestAnalyticsQueryParser(query, localParams, params, req); return new TestAnalyticsQueryParser(query, localParams, params, req);
} }

View File

@ -72,10 +72,6 @@ import org.junit.Ignore;
public class TestRankQueryPlugin extends QParserPlugin { public class TestRankQueryPlugin extends QParserPlugin {
public void init(NamedList params) {
}
public QParser createParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) { public QParser createParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new TestRankQueryParser(query, localParams, params, req); return new TestRankQueryParser(query, localParams, params, req);
} }