Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11140: Remove unused parameter in (private) SolrMetricManager.prepareCloudPlugins method. 

(Omar Abdelnabi via Christine Poerschke)
This commit is contained in:
Christine Poerschke 2017-08-01 11:14:32 +01:00
parent 292fca651a
commit 9422da26e5
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -120,6 +120,9 @@ Other Changes
* SOLR-11131: Document 'assert' as a command option in bin/solr, and bin/solr.cmd scripts. * SOLR-11131: Document 'assert' as a command option in bin/solr, and bin/solr.cmd scripts.
(Jason Gerlowski via Anshum Gupta) (Jason Gerlowski via Anshum Gupta)
* SOLR-11140: Remove unused parameter in (private) SolrMetricManager.prepareCloudPlugins method.
(Omar Abdelnabi via Christine Poerschke)
================== 7.0.0 ================== ================== 7.0.0 ==================
Versions of Major Components Versions of Major Components

13
solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
View File

@ -1005,8 +1005,7 @@ public class SolrMetricManager {
private List<PluginInfo> prepareCloudPlugins(PluginInfo[] pluginInfos, String group, String className, private List<PluginInfo> prepareCloudPlugins(PluginInfo[] pluginInfos, String group, String className,
Map<String, String> defaultAttributes, Map<String, String> defaultAttributes,
Map<String, Object> defaultInitArgs, Map<String, Object> defaultInitArgs) {
PluginInfo defaultPlugin) {
List<PluginInfo> result = new ArrayList<>(); List<PluginInfo> result = new ArrayList<>();
if (pluginInfos == null) { if (pluginInfos == null) {
pluginInfos = new PluginInfo[0]; pluginInfos = new PluginInfo[0];
@ -1021,12 +1020,6 @@ public class SolrMetricManager {
result.add(info); result.add(info);
} }
} }
if (result.isEmpty() && defaultPlugin != null) {
defaultPlugin = preparePlugin(defaultPlugin, className, defaultAttributes, defaultInitArgs);
if (defaultPlugin != null) {
result.add(defaultPlugin);
}
}
return result; return result;
} }
@ -1077,7 +1070,7 @@ public class SolrMetricManager {
String registryName = core.getCoreMetricManager().getRegistryName(); String registryName = core.getCoreMetricManager().getRegistryName();
// collect infos and normalize // collect infos and normalize
List<PluginInfo> infos = prepareCloudPlugins(pluginInfos, SolrInfoBean.Group.shard.toString(), SolrShardReporter.class.getName(), List<PluginInfo> infos = prepareCloudPlugins(pluginInfos, SolrInfoBean.Group.shard.toString(), SolrShardReporter.class.getName(),
attrs, initArgs, null); attrs, initArgs);
for (PluginInfo info : infos) { for (PluginInfo info : infos) {
try { try {
SolrMetricReporter reporter = loadReporter(registryName, core.getResourceLoader(), info, SolrMetricReporter reporter = loadReporter(registryName, core.getResourceLoader(), info,
@ -1100,7 +1093,7 @@ public class SolrMetricManager {
Map<String, Object> initArgs = new HashMap<>(); Map<String, Object> initArgs = new HashMap<>();
initArgs.put("period", DEFAULT_CLOUD_REPORTER_PERIOD); initArgs.put("period", DEFAULT_CLOUD_REPORTER_PERIOD);
List<PluginInfo> infos = prepareCloudPlugins(pluginInfos, SolrInfoBean.Group.cluster.toString(), SolrClusterReporter.class.getName(), List<PluginInfo> infos = prepareCloudPlugins(pluginInfos, SolrInfoBean.Group.cluster.toString(), SolrClusterReporter.class.getName(),
attrs, initArgs, null); attrs, initArgs);
String registryName = getRegistryName(SolrInfoBean.Group.cluster); String registryName = getRegistryName(SolrInfoBean.Group.cluster);
for (PluginInfo info : infos) { for (PluginInfo info : infos) {
try { try {