Apache Solr open-source search software
SOLR-15616: Fixing tidy formatting
Ishan Chattopadhyaya9f2a95f5fabf
diff --git a/solr/core/src/java/org/apache/solr/core/MetricsConfig.java b/solr/core/src/java/org/apache/solr/core/MetricsConfig.javaindex fd6dc5cd7c5..08f039927d2 100644--- a/solr/core/src/java/org/apache/solr/core/MetricsConfig.java+++ b/solr/core/src/java/org/apache/solr/core/MetricsConfig.java@@ -244,7 +244,7 @@ public class MetricsConfig {public static class CacheConfig {public Integer threadsIntervalSeconds; // intervals for which the threads metrics are cached- public CacheConfig (Integer threadsIntervalSeconds) {+ public CacheConfig(Integer threadsIntervalSeconds) {this.threadsIntervalSeconds = threadsIntervalSeconds;}}diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.javaindex a8a2c45cca2..d2e8bf1e6a5 100644--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java@@ -659,8 +659,13 @@ public class SolrXmlConfig {ConfigNode caching = metrics.get("solr/metrics/caching");if (caching != null) {- Object threadsCachingIntervalSeconds = DOMUtil.childNodesToNamedList(caching).get("threadsIntervalSeconds", null);- builder.setCacheConfig(new MetricsConfig.CacheConfig(threadsCachingIntervalSeconds == null? null: Integer.parseInt(threadsCachingIntervalSeconds.toString())));+ Object threadsCachingIntervalSeconds =+ DOMUtil.childNodesToNamedList(caching).get("threadsIntervalSeconds", null);+ builder.setCacheConfig(+ new MetricsConfig.CacheConfig(+ threadsCachingIntervalSeconds == null+ ? null+ : Integer.parseInt(threadsCachingIntervalSeconds.toString())));}PluginInfo[] reporterPlugins = getMetricReporterPluginInfos(metrics);diff --git a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.javaindex 99458db9e50..e8880270621 100644--- a/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java+++ b/solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java@@ -429,13 +429,25 @@ public class CoreContainerProvider implements ServletContextListener {metricManager.registerAll(registryName, new MemoryUsageGaugeSet(), ResolutionStrategy.IGNORE, "memory");- if (config.getCacheConfig() != null && config.getCacheConfig().threadsIntervalSeconds != null) {- if (log.isInfoEnabled()) {- log.info("Threads metrics will be cached for {} seconds", config.getCacheConfig().threadsIntervalSeconds);- }- metricManager.registerAll(registryName, new CachedThreadStatesGaugeSet(config.getCacheConfig().threadsIntervalSeconds, TimeUnit.SECONDS), SolrMetricManager.ResolutionStrategy.IGNORE, "threads");+ if (config.getCacheConfig() != null+ && config.getCacheConfig().threadsIntervalSeconds != null) {+ if (log.isInfoEnabled()) {+ log.info(+ "Threads metrics will be cached for {} seconds",+ config.getCacheConfig().threadsIntervalSeconds);+ }+ metricManager.registerAll(+ registryName,+ new CachedThreadStatesGaugeSet(+ config.getCacheConfig().threadsIntervalSeconds, TimeUnit.SECONDS),+ SolrMetricManager.ResolutionStrategy.IGNORE,+ "threads");} else {- metricManager.registerAll(registryName, new ThreadStatesGaugeSet(), SolrMetricManager.ResolutionStrategy.IGNORE, "threads");+ metricManager.registerAll(+ registryName,+ new ThreadStatesGaugeSet(),+ SolrMetricManager.ResolutionStrategy.IGNORE,+ "threads");}MetricsMap sysprops =