Apache Solr open-source search software
SOLR-14393: Remove HIGHLIGHTER, QUERYPARSER, SPELLCHECKER metrics (#3469)
Matthew Biscocho9561d06026f1
diff --git a/solr/core/src/java/org/apache/solr/core/SolrInfoBean.java b/solr/core/src/java/org/apache/solr/core/SolrInfoBean.javaindex 6957bb76f1b..d62f51e439e 100644--- a/solr/core/src/java/org/apache/solr/core/SolrInfoBean.java+++ b/solr/core/src/java/org/apache/solr/core/SolrInfoBean.java@@ -32,9 +32,6 @@ public interface SolrInfoBean extends SolrMetricProducer {QUERY,UPDATE,CACHE,- HIGHLIGHTER,- QUERYPARSER,- SPELLCHECKER,SEARCHER,REPLICATION,TLOG,diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.javaindex 37c87653cef..99f02dcf955 100644--- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java@@ -240,20 +240,11 @@ public class HighlightComponent extends SearchComponent}}- ////////////////////////////////////////////- /// SolrInfoBean- ////////////////////////////////////////////-@Overridepublic String getDescription() {return "Highlighting";}- @Override- public Category getCategory() {- return Category.HIGHLIGHTER;- }-/////////////////////////////////////////////// highlighting response collation////////////////////////////////////////////diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.javaindex 687b3adf030..98af4ed46dc 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java@@ -875,17 +875,8 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwarreturn Collections.unmodifiableMap(spellCheckers);}- // ///////////////////////////////////////////- // / SolrInfoBean- // //////////////////////////////////////////-@Overridepublic String getDescription() {return "A Spell Checker component";}-- @Override- public Category getCategory() {- return Category.SPELLCHECKER;- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java b/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.javaindex 8efefef314b..af11bbbf6a6 100644--- a/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java+++ b/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java@@ -63,13 +63,4 @@ public class BreakIteratorBoundaryScanner extends SolrBoundaryScanner {return new org.apache.lucene.search.vectorhighlight.BreakIteratorBoundaryScanner(bi);}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "BreakIteratorBoundaryScanner";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java b/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.javaindex a648a1f8ab4..c049b5e313b 100644--- a/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java@@ -26,13 +26,4 @@ public class DefaultEncoder extends HighlightingPluginBase implements SolrEncodepublic Encoder getEncoder(String fieldName, SolrParams params) {return new org.apache.lucene.search.highlight.DefaultEncoder();}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "DefaultEncoder";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.javaindex 4dc42ef27df..3a5f845b1d0 100644--- a/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java+++ b/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java@@ -28,21 +28,11 @@ import org.apache.solr.common.params.SolrParams;public class GapFragmenter extends HighlightingPluginBase implements SolrFragmenter {@Overridepublic Fragmenter getFragmenter(String fieldName, SolrParams params) {- numRequests.inc();params = SolrParams.wrapDefaults(params, defaults);int fragsize = params.getFieldInt(fieldName, HighlightParams.FRAGSIZE, 100);return (fragsize <= 0) ? new NullFragmenter() : new LuceneGapFragmenter(fragsize);}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "GapFragmenter";- }}/**diff --git a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.javaindex c0e45ef582f..af38f8f0257 100644--- a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java+++ b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java@@ -16,22 +16,15 @@*/package org.apache.solr.highlight;-import com.codahale.metrics.Counter;-import io.opentelemetry.api.common.Attributes;-import java.util.Set;-import java.util.concurrent.ConcurrentHashMap;import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;-import org.apache.solr.core.SolrInfoBean;import org.apache.solr.metrics.SolrMetricsContext;/*** @since solr 1.3*/-public abstract class HighlightingPluginBase implements SolrInfoBean {- protected Counter numRequests;+public abstract class HighlightingPluginBase {protected SolrParams defaults;- protected Set<String> metricNames = ConcurrentHashMap.newKeySet(1);protected SolrMetricsContext solrMetricsContext;public void init(NamedList<?> args) {@@ -42,32 +35,4 @@ public abstract class HighlightingPluginBase implements SolrInfoBean {}}}-- //////////////////////// SolrInfoMBeans methods //////////////////////-- @Override- public String getName() {- return this.getClass().getName();- }-- @Override- public abstract String getDescription();-- @Override- public Category getCategory() {- return Category.HIGHLIGHTER;- }-- @Override- public SolrMetricsContext getSolrMetricsContext() {- return solrMetricsContext;- }-- // TODO SOLR-17458: Migrate to OTEL- @Override- public void initializeMetrics(- SolrMetricsContext parentContext, Attributes attributes, String scope) {- solrMetricsContext = parentContext.getChildContext(this);- numRequests = solrMetricsContext.counter("requests", getCategory().toString(), scope);- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java b/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.javaindex 9a8190d5f4a..3344b454846 100644--- a/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java+++ b/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java@@ -27,13 +27,4 @@ public class HtmlEncoder extends HighlightingPluginBase implements SolrEncoder {public Encoder getEncoder(String fieldName, SolrParams params) {return new SimpleHTMLEncoder();}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "HtmlEncoder";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java b/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.javaindex bb82e866054..a89e792b063 100644--- a/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java+++ b/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java@@ -25,20 +25,10 @@ import org.apache.solr.common.params.SolrParams;public class HtmlFormatter extends HighlightingPluginBase implements SolrFormatter {@Overridepublic Formatter getFormatter(String fieldName, SolrParams params) {- numRequests.inc();params = SolrParams.wrapDefaults(params, defaults);return new SimpleHTMLFormatter(params.getFieldParam(fieldName, HighlightParams.SIMPLE_PRE, "<em>"),params.getFieldParam(fieldName, HighlightParams.SIMPLE_POST, "</em>"));}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "HtmlFormatter";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.javaindex e55923ddb0c..6370d9a9fe3 100644--- a/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java+++ b/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java@@ -56,7 +56,6 @@ public class RegexFragmenter extends HighlightingPluginBase implements SolrFragm@Overridepublic Fragmenter getFragmenter(String fieldName, SolrParams params) {- numRequests.inc();params = SolrParams.wrapDefaults(params, defaults);int fragsize =@@ -85,13 +84,4 @@ public class RegexFragmenter extends HighlightingPluginBase implements SolrFragmreturn new LuceneRegexFragmenter(fragsize, increment, slop, maxchars, p);}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "RegexFragmenter (" + defaultPatternRaw + ")";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.javaindex fdd43efd0ff..fa8159cf0ab 100644--- a/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java+++ b/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java@@ -31,13 +31,4 @@ public class ScoreOrderFragmentsBuilder extends SolrFragmentsBuilder {sofb.setMultiValuedSeparator(getMultiValuedSeparatorChar(params));return sofb;}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "ScoreOrderFragmentsBuilder";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java b/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.javaindex 30fdcb0ad90..76d77a218ee 100644--- a/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java+++ b/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java@@ -32,13 +32,4 @@ public class SimpleBoundaryScanner extends SolrBoundaryScanner {}return new org.apache.lucene.search.vectorhighlight.SimpleBoundaryScanner(maxScan, chars);}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "SimpleBoundaryScanner";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.javaindex efac2c56a97..d0c7f7d2a22 100644--- a/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java+++ b/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java@@ -27,17 +27,6 @@ public class SimpleFragListBuilder extends HighlightingPluginBase implements Sol// If that ever changes, it should wrap them with defaults...// params = SolrParams.wrapDefaults(params, defaults)- numRequests.inc();-return new org.apache.lucene.search.vectorhighlight.SimpleFragListBuilder();}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "SimpleFragListBuilder";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.javaindex 4ed6926a32a..c32191c9878 100644--- a/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java+++ b/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java@@ -30,13 +30,4 @@ public class SimpleFragmentsBuilder extends SolrFragmentsBuilder {sfb.setMultiValuedSeparator(getMultiValuedSeparatorChar(params));return sfb;}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "SimpleFragmentsBuilder";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.javaindex e1741583814..a53c29d9341 100644--- a/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java+++ b/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java@@ -27,17 +27,6 @@ public class SingleFragListBuilder extends HighlightingPluginBase implements Sol// If that ever changes, it should wrap them with defaults...// params = SolrParams.wrapDefaults(params, defaults)- numRequests.inc();-return new org.apache.lucene.search.vectorhighlight.SingleFragListBuilder();}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "SingleFragListBuilder";- }}diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrBoundaryScanner.java b/solr/core/src/java/org/apache/solr/highlight/SolrBoundaryScanner.javaindex 7981fa1051f..eb70190bbd2 100644--- a/solr/core/src/java/org/apache/solr/highlight/SolrBoundaryScanner.java+++ b/solr/core/src/java/org/apache/solr/highlight/SolrBoundaryScanner.java@@ -18,14 +18,12 @@ package org.apache.solr.highlight;import org.apache.lucene.search.vectorhighlight.BoundaryScanner;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.core.SolrInfoBean;import org.apache.solr.util.plugin.NamedListInitializedPlugin;public abstract class SolrBoundaryScanner extends HighlightingPluginBase- implements SolrInfoBean, NamedListInitializedPlugin {+ implements NamedListInitializedPlugin {public BoundaryScanner getBoundaryScanner(String fieldName, SolrParams params) {- numRequests.inc();params = SolrParams.wrapDefaults(params, defaults);return get(fieldName, params);diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java b/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.javaindex f47f3ab7849..4db06d01f3e 100644--- a/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java+++ b/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java@@ -18,10 +18,9 @@ package org.apache.solr.highlight;import org.apache.lucene.search.highlight.Encoder;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.core.SolrInfoBean;import org.apache.solr.util.plugin.NamedListInitializedPlugin;-public interface SolrEncoder extends SolrInfoBean, NamedListInitializedPlugin {+public interface SolrEncoder extends NamedListInitializedPlugin {/*** Return an {@link org.apache.lucene.search.highlight.Encoder} appropriate for this field.*diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java b/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.javaindex e7558bab9bf..ec29701e943 100644--- a/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java+++ b/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java@@ -18,10 +18,9 @@ package org.apache.solr.highlight;import org.apache.lucene.search.highlight.Formatter;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.core.SolrInfoBean;import org.apache.solr.util.plugin.NamedListInitializedPlugin;-public interface SolrFormatter extends SolrInfoBean, NamedListInitializedPlugin {+public interface SolrFormatter extends NamedListInitializedPlugin {/*** Return a {@link org.apache.lucene.search.highlight.Formatter} appropriate for this field.diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.javaindex a8ef452debd..13fa7748481 100644--- a/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java+++ b/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java@@ -18,10 +18,9 @@ package org.apache.solr.highlight;import org.apache.lucene.search.vectorhighlight.FragListBuilder;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.core.SolrInfoBean;import org.apache.solr.util.plugin.NamedListInitializedPlugin;-public interface SolrFragListBuilder extends SolrInfoBean, NamedListInitializedPlugin {+public interface SolrFragListBuilder extends NamedListInitializedPlugin {/*** Return a FragListBuilder.*diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.javaindex e3ecd5d0b7d..1d89f4627a0 100644--- a/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java+++ b/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java@@ -18,10 +18,9 @@ package org.apache.solr.highlight;import org.apache.lucene.search.highlight.Fragmenter;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.core.SolrInfoBean;import org.apache.solr.util.plugin.NamedListInitializedPlugin;-public interface SolrFragmenter extends SolrInfoBean, NamedListInitializedPlugin {+public interface SolrFragmenter extends NamedListInitializedPlugin {/*** Return a {@link org.apache.lucene.search.highlight.Fragmenter} appropriate for this field.*diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.javaindex 50c1dd6818d..22b22e89303 100644--- a/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java+++ b/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java@@ -21,11 +21,10 @@ import org.apache.lucene.search.vectorhighlight.FragmentsBuilder;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.HighlightParams;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.core.SolrInfoBean;import org.apache.solr.util.plugin.NamedListInitializedPlugin;public abstract class SolrFragmentsBuilder extends HighlightingPluginBase- implements SolrInfoBean, NamedListInitializedPlugin {+ implements NamedListInitializedPlugin {public static final String DEFAULT_PRE_TAGS = "<em>";public static final String DEFAULT_POST_TAGS = "</em>";@@ -38,7 +37,6 @@ public abstract class SolrFragmentsBuilder extends HighlightingPluginBase* @return An appropriate {@link org.apache.lucene.search.vectorhighlight.FragmentsBuilder}.*/public FragmentsBuilder getFragmentsBuilder(SolrParams params, BoundaryScanner bs) {- numRequests.inc();params = SolrParams.wrapDefaults(params, defaults);return getFragmentsBuilder(params, getPreTags(params, null), getPostTags(params, null), bs);diff --git a/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.javaindex f2029fd1882..b0f2f9c1da5 100644--- a/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.java+++ b/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.java@@ -27,17 +27,6 @@ public class WeightedFragListBuilder extends HighlightingPluginBase implements S// If that ever changes, it should wrap them with defaults...// params = SolrParams.wrapDefaults(params, defaults)- numRequests.inc();-return new org.apache.lucene.search.vectorhighlight.WeightedFragListBuilder();}-- ///////////////////////////////////////////////////////////////////////- //////////////////////// SolrInfoMBeans methods ///////////////////////- ///////////////////////////////////////////////////////////////////////-- @Override- public String getDescription() {- return "WeightedFragListBuilder";- }}diff --git a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java b/solr/core/src/java/org/apache/solr/search/QParserPlugin.javaindex 9dcca155e8d..80855aa0bdf 100644--- a/solr/core/src/java/org/apache/solr/search/QParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java@@ -16,13 +16,10 @@*/package org.apache.solr.search;-import io.opentelemetry.api.common.Attributes;import java.util.Collections;import java.util.HashMap;import java.util.Map;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.core.SolrInfoBean;-import org.apache.solr.metrics.SolrMetricsContext;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.search.join.BlockJoinChildQParserPlugin;import org.apache.solr.search.join.BlockJoinParentQParserPlugin;@@ -35,7 +32,7 @@ import org.apache.solr.search.neural.KnnQParserPlugin;import org.apache.solr.search.neural.VectorSimilarityQParserPlugin;import org.apache.solr.util.plugin.NamedListInitializedPlugin;-public abstract class QParserPlugin implements NamedListInitializedPlugin, SolrInfoBean {+public abstract class QParserPlugin implements NamedListInitializedPlugin {/** internal use - name of the default parser */public static final String DEFAULT_QTYPE = LuceneQParserPlugin.NAME;@@ -104,33 +101,4 @@ public abstract class QParserPlugin implements NamedListInitializedPlugin, SolrI*/public abstract QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req);-- @Override- public String getName() {- // TODO: ideally use the NAME property that each qparser plugin has-- return this.getClass().getName();- }-- @Override- public String getDescription() {- return ""; // UI required non-null to work- }-- @Override- public Category getCategory() {- return Category.QUERYPARSER;- }-- @Override- public void initializeMetrics(- SolrMetricsContext parentContext, Attributes attributes, String scope) {- // by default do nothing- }-- // by default no metrics- @Override- public SolrMetricsContext getSolrMetricsContext() {- return null;- }}diff --git a/solr/core/src/java/org/apache/solr/search/join/HashRangeQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/join/HashRangeQParserPlugin.javaindex bdf237d4250..1cb408cf050 100644--- a/solr/core/src/java/org/apache/solr/search/join/HashRangeQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/join/HashRangeQParserPlugin.java@@ -36,9 +36,4 @@ public class HashRangeQParserPlugin extends QParserPlugin {String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {return new HashRangeQParser(qstr, localParams, params, req);}-- @Override- public String getName() {- return NAME;- }}diff --git a/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java b/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.javaindex 1cfc840e7ef..5d929230e46 100644--- a/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java+++ b/solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java@@ -56,11 +56,10 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {}public void testCreateParser() throws IOException {- try (RankQParserPlugin rankQPPlugin = new RankQParserPlugin()) {- QParser parser = rankQPPlugin.createParser("", SolrParams.of(), SolrParams.of(), req());- assertNotNull(parser);- assertTrue(parser instanceof RankQParser);- }+ RankQParserPlugin rankQPPlugin = new RankQParserPlugin();+ QParser parser = rankQPPlugin.createParser("", SolrParams.of(), SolrParams.of(), req());+ assertNotNull(parser);+ assertTrue(parser instanceof RankQParser);}public void testSyntaxErrors() {@@ -396,10 +395,8 @@ public class RankQParserPluginTest extends SolrTestCaseJ4 {assertThat(se.getMessage(), CoreMatchers.containsString(expectedExceptionMsg));}- private RankQParser getRankQParser(SolrParams localParams, SolrQueryRequest req)- throws IOException {- try (RankQParserPlugin rankQPPlugin = new RankQParserPlugin()) {- return (RankQParser) rankQPPlugin.createParser("", localParams, req.getParams(), req);- }+ private RankQParser getRankQParser(SolrParams localParams, SolrQueryRequest req) {+ RankQParserPlugin rankQPPlugin = new RankQParserPlugin();+ return (RankQParser) rankQPPlugin.createParser("", localParams, req.getParams(), req);}}diff --git a/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java b/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.javaindex 62ab2528709..66826e34ae8 100644--- a/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java+++ b/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java@@ -473,7 +473,6 @@ public class BJQParserTest extends SolrTestCaseJ4 {final BlockJoinParentQParserPlugin blockJoinParentQParserPlugin =new BlockJoinParentQParserPlugin();blockJoinParentQParserPlugin.init(null);- blockJoinParentQParserPlugin.close();}private static final String eParent[] =