(solr) branch branch_9x updated: Minor: Improving array list and map init (#2197)

[dsmiley]

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new a8360ce2f43 Minor: Improving array list and map init (#2197)
a8360ce2f43 is described below

commit a8360ce2f4361539eeb5a6e6d5a0ceeb4c4fcfd5
Author: Renato Haeberli <ren...@onnet.ch>
AuthorDate: Fri Apr 26 23:47:12 2024 +0200

    Minor: Improving array list and map init (#2197)
    
    Co-authored-by: Renato Haeberli <>
    (cherry picked from commit 66f139071cc92ae4c054e7a2c8d8c229a3576219)
---
 .../solr/handler/component/SearchComponent.java    | 31 +++++++++-------------
 .../solr/handler/component/SearchHandler.java      |  2 +-
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git 
a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java 
b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
index ecdd636b083..913078c27ee 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java
@@ -17,8 +17,6 @@
 package org.apache.solr.handler.component;
 
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import org.apache.solr.core.SolrInfoBean;
 import org.apache.solr.metrics.SolrMetricsContext;
@@ -111,21 +109,16 @@ public abstract class SearchComponent implements 
SolrInfoBean, NamedListInitiali
     this.solrMetricsContext = parentContext.getChildContext(this);
   }
 
-  public static final Map<String, Class<? extends SearchComponent>> 
standard_components;
-
-  static {
-    HashMap<String, Class<? extends SearchComponent>> map = new HashMap<>();
-    map.put(HighlightComponent.COMPONENT_NAME, HighlightComponent.class);
-    map.put(QueryComponent.COMPONENT_NAME, QueryComponent.class);
-    map.put(FacetComponent.COMPONENT_NAME, FacetComponent.class);
-    map.put(FacetModule.COMPONENT_NAME, FacetModule.class);
-    map.put(MoreLikeThisComponent.COMPONENT_NAME, MoreLikeThisComponent.class);
-    map.put(StatsComponent.COMPONENT_NAME, StatsComponent.class);
-    map.put(DebugComponent.COMPONENT_NAME, DebugComponent.class);
-    map.put(RealTimeGetComponent.COMPONENT_NAME, RealTimeGetComponent.class);
-    map.put(ExpandComponent.COMPONENT_NAME, ExpandComponent.class);
-    map.put(TermsComponent.COMPONENT_NAME, TermsComponent.class);
-
-    standard_components = Collections.unmodifiableMap(map);
-  }
+  public static final Map<String, Class<? extends SearchComponent>> 
standard_components =
+      Map.of(
+          HighlightComponent.COMPONENT_NAME, HighlightComponent.class,
+          QueryComponent.COMPONENT_NAME, QueryComponent.class,
+          FacetComponent.COMPONENT_NAME, FacetComponent.class,
+          FacetModule.COMPONENT_NAME, FacetModule.class,
+          MoreLikeThisComponent.COMPONENT_NAME, MoreLikeThisComponent.class,
+          StatsComponent.COMPONENT_NAME, StatsComponent.class,
+          DebugComponent.COMPONENT_NAME, DebugComponent.class,
+          RealTimeGetComponent.COMPONENT_NAME, RealTimeGetComponent.class,
+          ExpandComponent.COMPONENT_NAME, ExpandComponent.class,
+          TermsComponent.COMPONENT_NAME, TermsComponent.class);
 }
diff --git 
a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java 
b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 06bf45d48da..68719a033e2 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -116,7 +116,7 @@ public class SearchHandler extends RequestHandlerBase
   private SolrCore core;
 
   protected List<String> getDefaultComponents() {
-    ArrayList<String> names = new ArrayList<>(8);
+    ArrayList<String> names = new ArrayList<>(9);
     names.add(QueryComponent.COMPONENT_NAME);
     names.add(FacetComponent.COMPONENT_NAME);
     names.add(FacetModule.COMPONENT_NAME);