From 9422da26e52730de5d21d52e26e52ec9c8772df5 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Tue, 1 Aug 2017 11:14:32 +0100
Subject: [PATCH] SOLR-11140: Remove unused parameter in (private)
 SolrMetricManager.prepareCloudPlugins method. (Omar Abdelnabi via Christine
 Poerschke)

---
 solr/CHANGES.txt                                    |  3 +++
 .../org/apache/solr/metrics/SolrMetricManager.java  | 13 +++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 21d0789da06..16fd11952e7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -120,6 +120,9 @@ Other Changes
 * SOLR-11131: Document 'assert' as a command option in bin/solr, and bin/solr.cmd scripts.
   (Jason Gerlowski via Anshum Gupta)
 
+* SOLR-11140: Remove unused parameter in (private) SolrMetricManager.prepareCloudPlugins method.
+  (Omar Abdelnabi via Christine Poerschke)
+
 ==================  7.0.0 ==================
 
 Versions of Major Components
diff --git a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
index c041d1fb02e..8b17c78fe0b 100644
--- a/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrMetricManager.java
@@ -1005,8 +1005,7 @@ public class SolrMetricManager {
 
   private List<PluginInfo> prepareCloudPlugins(PluginInfo[] pluginInfos, String group, String className,
                                                       Map<String, String> defaultAttributes,
-                                                      Map<String, Object> defaultInitArgs,
-                                                      PluginInfo defaultPlugin) {
+                                                      Map<String, Object> defaultInitArgs) {
     List<PluginInfo> result = new ArrayList<>();
     if (pluginInfos == null) {
       pluginInfos = new PluginInfo[0];
@@ -1021,12 +1020,6 @@ public class SolrMetricManager {
         result.add(info);
       }
     }
-    if (result.isEmpty() && defaultPlugin != null) {
-      defaultPlugin = preparePlugin(defaultPlugin, className, defaultAttributes, defaultInitArgs);
-      if (defaultPlugin != null) {
-        result.add(defaultPlugin);
-      }
-    }
     return result;
   }
 
@@ -1077,7 +1070,7 @@ public class SolrMetricManager {
     String registryName = core.getCoreMetricManager().getRegistryName();
     // collect infos and normalize
     List<PluginInfo> infos = prepareCloudPlugins(pluginInfos, SolrInfoBean.Group.shard.toString(), SolrShardReporter.class.getName(),
-        attrs, initArgs, null);
+        attrs, initArgs);
     for (PluginInfo info : infos) {
       try {
         SolrMetricReporter reporter = loadReporter(registryName, core.getResourceLoader(), info,
@@ -1100,7 +1093,7 @@ public class SolrMetricManager {
     Map<String, Object> initArgs = new HashMap<>();
     initArgs.put("period", DEFAULT_CLOUD_REPORTER_PERIOD);
     List<PluginInfo> infos = prepareCloudPlugins(pluginInfos, SolrInfoBean.Group.cluster.toString(), SolrClusterReporter.class.getName(),
-        attrs, initArgs, null);
+        attrs, initArgs);
     String registryName = getRegistryName(SolrInfoBean.Group.cluster);
     for (PluginInfo info : infos) {
       try {