You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/11 08:00:44 UTC
[08/50] [abbrv] lucene-solr:jira/solr-11702: SOLR-11798: Remove
support for deprecated top-level syntax in solrconfig.xml.
(master branch for 8x only)
SOLR-11798: Remove support for deprecated top-level <highlighting> syntax in solrconfig.xml.
(master branch for 8x only)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5a08fa8b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5a08fa8b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5a08fa8b
Branch: refs/heads/jira/solr-11702
Commit: 5a08fa8bbb1cf26b4af5b71549671c31e1427f44
Parents: 65c842f
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Jan 4 15:07:34 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Jan 4 15:22:07 2018 +0000
----------------------------------------------------------------------
.../handler/component/HighlightComponent.java | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a08fa8b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
----------------------------------------------------------------------
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.java
index 1602502..0ee6855 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
@@ -25,7 +25,6 @@ import java.util.stream.Stream;
import com.google.common.base.Objects;
import org.apache.lucene.search.Query;
-import org.apache.lucene.util.Version;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.HighlightParams;
import org.apache.solr.common.params.SolrParams;
@@ -47,7 +46,6 @@ import org.apache.solr.util.plugin.PluginInfoInitialized;
import org.apache.solr.util.plugin.SolrCoreAware;
import static java.util.stream.Collectors.toMap;
-import static org.apache.solr.core.Config.assertWarnOrFail;
/**
* TODO!
@@ -132,19 +130,9 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni
public void inform(SolrCore core) {
List<PluginInfo> children = info.getChildren("highlighting");
if(children.isEmpty()) {
- PluginInfo pluginInfo = core.getSolrConfig().getPluginInfo(SolrHighlighter.class.getName()); //TODO deprecated configuration remove later
- assertWarnOrFail("solrconfig.xml <highlighting> configuration is deprecated since SOLR-1696 "
- + "and no longer supported from Solr 7.3 onwards. "
- + "Please configure via <searchComponent> instead.",
- (null == pluginInfo),
- core.getSolrConfig().luceneMatchVersion.onOrAfter(Version.LUCENE_7_3_0));
- if (pluginInfo != null) {
- solrConfigHighlighter = core.createInitInstance(pluginInfo, SolrHighlighter.class, null, DefaultSolrHighlighter.class.getName());
- } else {
- DefaultSolrHighlighter defHighlighter = new DefaultSolrHighlighter(core);
- defHighlighter.init(PluginInfo.EMPTY_INFO);
- solrConfigHighlighter = defHighlighter;
- }
+ DefaultSolrHighlighter defHighlighter = new DefaultSolrHighlighter(core);
+ defHighlighter.init(PluginInfo.EMPTY_INFO);
+ solrConfigHighlighter = defHighlighter;
} else {
solrConfigHighlighter = core.createInitInstance(children.get(0),SolrHighlighter.class,null, DefaultSolrHighlighter.class.getName());
}