SOLR-14680: Remove SimpleMap (affects NamedList)

solr/core/src/java/org/apache/solr/cli/ApiTool.java

@@ -98,7 +98,7 @@ protected String callGet(String url, String credentials) throws Exception {
       NamedList<Object> response = solrClient.request(req);
       // pretty-print the response to stdout
       CharArr arr = new CharArr();
-      new JSONWriter(arr, 2).write(response.asMap());
+      new JSONWriter(arr, 2).write(response.asMap(10));
       return arr.toString();
     }
   }

solr/core/src/java/org/apache/solr/cli/CreateTool.java

@@ -22,7 +22,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.cli.CommandLine;
@@ -167,10 +166,9 @@ protected void createCore(CommandLine cli, SolrClient solrClient) throws Excepti
 
     String coreRootDirectory; // usually same as solr home, but not always
 
-    Map<String, Object> systemInfo =
-        solrClient
-            .request(new GenericSolrRequest(SolrRequest.METHOD.GET, CommonParams.SYSTEM_INFO_PATH))
-            .asMap();
+    NamedList<?> systemInfo =
+        solrClient.request(
+            new GenericSolrRequest(SolrRequest.METHOD.GET, CommonParams.SYSTEM_INFO_PATH));
 
     // convert raw JSON into user-friendly output
     coreRootDirectory = (String) systemInfo.get("core_root");
@@ -321,7 +319,7 @@ protected void createCollection(CloudSolrClient cloudSolrClient, CommandLine cli
     if (isVerbose()) {
       // pretty-print the response to stdout
       CharArr arr = new CharArr();
-      new JSONWriter(arr, 2).write(response.asMap());
+      new JSONWriter(arr, 2).write(response.asMap(10));
       echo(arr.toString());
     }
     String endMessage =

solr/core/src/java/org/apache/solr/cli/DeleteTool.java

@@ -211,7 +211,7 @@ protected void deleteCollection(CloudSolrClient cloudSolrClient, CommandLine cli
     if (isVerbose() && response != null) {
       // pretty-print the response to stdout
       CharArr arr = new CharArr();
-      new JSONWriter(arr, 2).write(response.asMap());
+      new JSONWriter(arr, 2).write(response.asShallowMap());
       echo(arr.toString());
       echo("\n");
     }

solr/core/src/java/org/apache/solr/cli/SolrCLI.java

@@ -705,7 +705,7 @@ public static boolean safeCheckCoreExists(String solrUrl, String coreName, Strin
         Map<String, Object> failureStatus =
             (Map<String, Object>) existsCheckResult.get("initFailures");
         String errorMsg = (String) failureStatus.get(coreName);
-        final boolean hasName = coreStatus != null && coreStatus.asMap().containsKey(NAME);
+        final boolean hasName = coreStatus != null && coreStatus.get(NAME) != null;
         exists = hasName || errorMsg != null;
         wait = hasName && errorMsg == null && "true".equals(coreStatus.get("isLoading"));
       } while (wait && System.nanoTime() - startWaitAt < MAX_WAIT_FOR_CORE_LOAD_NANOS);

solr/core/src/java/org/apache/solr/cli/StatusTool.java

@@ -358,13 +358,14 @@ protected Map<String, String> getCloudStatus(SolrClient solrClient, String zkHos
     Map<String, String> cloudStatus = new LinkedHashMap<>();
     cloudStatus.put("ZooKeeper", (zkHost != null) ? zkHost : "?");
 
+    // TODO add booleans to request just what we want; not everything
     NamedList<Object> json = solrClient.request(new CollectionAdminRequest.ClusterStatus());
 
     List<String> liveNodes = (List<String>) json.findRecursive("cluster", "live_nodes");
     cloudStatus.put("liveNodes", String.valueOf(liveNodes.size()));
 
-    Map<String, Object> collections =
-        ((NamedList<Object>) json.findRecursive("cluster", "collections")).asMap();
+    // TODO get this as a metric from the metrics API instead, or something else.
+    var collections = (NamedList<Object>) json.findRecursive("cluster", "collections");
     cloudStatus.put("collections", String.valueOf(collections.size()));
 
     return cloudStatus;

solr/core/src/java/org/apache/solr/core/OverlaidConfigNode.java

@@ -19,9 +19,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import org.apache.solr.cluster.api.SimpleMap;
 import org.apache.solr.common.ConfigNode;
 
 /** A config node impl which has an overlay */
@@ -80,7 +80,7 @@ public String name() {
   }
 
   @Override
-  public SimpleMap<String> attributes() {
+  public Map<String, String> attributes() {
     return delegate.attributes();
   }
 

solr/core/src/java/org/apache/solr/core/PluginInfo.java

@@ -118,7 +118,7 @@ public PluginInfo(ConfigNode node, String err, boolean requireName, boolean requ
     className = cName.className;
     pkgName = cName.pkg;
     initArgs = DOMUtil.childNodesToNamedList(node);
-    attributes = node.attributes().asMap();
+    attributes = node.attributes();
     children = loadSubPlugins(node);
     isFromSolrConfig = true;
   }

solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java

@@ -31,6 +31,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -131,10 +132,10 @@ public static NodeConfig fromConfig(
     // since it is arranged as a separate section it is placed here
     Map<String, String> coreAdminHandlerActions =
         readNodeListAsNamedList(root.get("coreAdminHandlerActions"), "<coreAdminHandlerActions>")
-            .asMap()
+            .asShallowMap()
             .entrySet()
             .stream()
-            .collect(Collectors.toMap(item -> item.getKey(), item -> item.getValue().toString()));
+            .collect(Collectors.toMap(Entry::getKey, item -> item.getValue().toString()));
 
     UpdateShardHandlerConfig updateConfig;
     if (deprecatedUpdateConfig == null) {
@@ -733,7 +734,7 @@ private static MetricsConfig getMetricsConfig(ConfigNode metrics) {
     ConfigNode caching = metrics.get("solr/metrics/caching");
     if (caching != null) {
       Object threadsCachingIntervalSeconds =
-          DOMUtil.childNodesToNamedList(caching).get("threadsIntervalSeconds", null);
+          DOMUtil.childNodesToNamedList(caching).get("threadsIntervalSeconds");
       builder.setCacheConfig(
           new MetricsConfig.CacheConfig(
               threadsCachingIntervalSeconds == null

solr/core/src/java/org/apache/solr/schema/IndexSchema.java

@@ -526,7 +526,7 @@ protected void readSchema(ConfigSetService.ConfigResource is) {
         log.info("{}", sb);
       }
 
-      version = Float.parseFloat(rootNode.attributes().get("version", "1.0f"));
+      version = Float.parseFloat(rootNode.attributes().getOrDefault("version", "1.0f"));
 
       // load the Field Types
       final FieldTypePluginLoader typeLoader =

solr/core/src/java/org/apache/solr/search/CacheConfig.java

@@ -87,7 +87,7 @@ public static Map<String, CacheConfig> getMultipleConfigs(
     for (ConfigNode node : nodes) {
       if (node.boolAttr("enabled", true)) {
         CacheConfig config =
-            getConfig(loader, solrConfig, node.name(), node.attributes().asMap(), configPath);
+            getConfig(loader, solrConfig, node.name(), node.attributes(), configPath);
         result.put(config.args.get(NAME), config);
       }
     }
@@ -98,7 +98,7 @@ public static CacheConfig getConfig(SolrConfig solrConfig, ConfigNode node, Stri
     if (!node.boolAttr("enabled", true) || !node.exists()) {
       return null;
     }
-    return getConfig(solrConfig, node.name(), node.attributes().asMap(), xpath);
+    return getConfig(solrConfig, node.name(), node.attributes(), xpath);
   }
 
   public static CacheConfig getConfig(

solr/core/src/java/org/apache/solr/update/UpdateLog.java

@@ -391,7 +391,8 @@ public void init(PluginInfo info) {
     }
     int timeoutMs =
         objToInt(
-            info.initArgs.get("docLockTimeoutMs", info.initArgs.get("versionBucketLockTimeoutMs")),
+            info.initArgs.getOrDefault(
+                "docLockTimeoutMs", info.initArgs.get("versionBucketLockTimeoutMs")),
             EnvUtils.getPropertyAsLong("solr.update.docLockTimeoutMs", 0L).intValue());
     updateLocks = new UpdateLocks(timeoutMs);
 

solr/core/src/java/org/apache/solr/util/DOMConfigNode.java

@@ -18,22 +18,19 @@
 package org.apache.solr.util;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
-import org.apache.solr.cluster.api.SimpleMap;
 import org.apache.solr.common.ConfigNode;
 import org.apache.solr.common.util.DOMUtil;
-import org.apache.solr.common.util.WrappedSimpleMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /** Read using DOM */
 public class DOMConfigNode implements ConfigNode {
 
   private final Node node;
-  SimpleMap<String> attrs;
+  Map<String, String> attrs;
 
   @Override
   public String name() {
@@ -50,10 +47,10 @@ public DOMConfigNode(Node node) {
   }
 
   @Override
-  public SimpleMap<String> attributes() {
+  public Map<String, String> attributes() {
     if (attrs != null) return attrs;
     Map<String, String> attrs = DOMUtil.toMap(node.getAttributes());
-    return this.attrs = attrs.size() == 0 ? EMPTY : new WrappedSimpleMap<>(attrs);
+    return this.attrs = attrs.isEmpty() ? Map.of() : attrs;
   }
 
   @Override
@@ -85,6 +82,4 @@ public void forEachChild(Function<ConfigNode, Boolean> fun) {
       if (Boolean.FALSE.equals(toContinue)) break;
     }
   }
-
-  private static final SimpleMap<String> EMPTY = new WrappedSimpleMap<>(Collections.emptyMap());
 }

solr/core/src/java/org/apache/solr/util/DataConfigNode.java

@@ -17,31 +17,31 @@
 
 package org.apache.solr.util;
 
+import java.util.AbstractMap;
+import java.util.AbstractSet;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import org.apache.solr.cluster.api.SimpleMap;
 import org.apache.solr.common.ConfigNode;
 import org.apache.solr.common.util.PropertiesUtil;
-import org.apache.solr.common.util.WrappedSimpleMap;
 
 /** ConfigNode impl that copies and maintains data internally from DOM */
 public class DataConfigNode implements ConfigNode {
   public final String name;
-  public final SimpleMap<String> attributes;
-  public final SimpleMap<List<ConfigNode>> kids;
+  public final Map<String, String> attributes;
+  public final Map<String, List<ConfigNode>> kids;
   public final String textData;
 
   public DataConfigNode(ConfigNode root) {
     Map<String, List<ConfigNode>> kids = new LinkedHashMap<>();
     name = root.name();
-    attributes = wrap(root.attributes());
+    attributes = wrapSubstituting(root.attributes());
     textData = root.txt();
     root.forEachChild(
         it -> {
@@ -54,31 +54,17 @@ public DataConfigNode(ConfigNode root) {
         e.setValue(List.copyOf(e.getValue()));
       }
     }
-    this.kids = kids.isEmpty() ? EMPTY : new WrappedSimpleMap<>(Map.copyOf(kids));
+    this.kids = Map.copyOf(kids);
   }
 
-  public String subtituteVal(String s) {
+  private static String substituteVal(String s) {
     return PropertiesUtil.substitute(s, SUBSTITUTES.get());
   }
 
-  private SimpleMap<String> wrap(SimpleMap<String> delegate) {
+  /** provides a substitute view, and read-only */
+  private static Map<String, String> wrapSubstituting(Map<String, String> delegate) {
     if (delegate.size() == 0) return delegate; // avoid unnecessary object creation
-    return new SimpleMap<>() {
-      @Override
-      public String get(String key) {
-        return subtituteVal(delegate.get(key));
-      }
-
-      @Override
-      public void forEachEntry(BiConsumer<String, ? super String> fun) {
-        delegate.forEachEntry((k, v) -> fun.accept(k, subtituteVal(v)));
-      }
-
-      @Override
-      public int size() {
-        return delegate.size();
-      }
-    };
+    return new SubstitutingMap(delegate);
   }
 
   @Override
@@ -88,11 +74,11 @@ public String name() {
 
   @Override
   public String txt() {
-    return subtituteVal(textData);
+    return substituteVal(textData);
   }
 
   @Override
-  public SimpleMap<String> attributes() {
+  public Map<String, String> attributes() {
     return attributes;
   }
 
@@ -104,7 +90,7 @@ public ConfigNode child(String name) {
 
   @Override
   public List<ConfigNode> getAll(String name) {
-    return kids.get(name, Collections.emptyList());
+    return kids.getOrDefault(name, List.of());
   }
 
   @Override
@@ -126,14 +112,82 @@ public List<ConfigNode> getAll(Predicate<ConfigNode> test, Set<String> matchName
 
   @Override
   public void forEachChild(Function<ConfigNode, Boolean> fun) {
-    kids.forEachEntry(
+    kids.forEach(
         (s, configNodes) -> {
           if (configNodes != null) {
             configNodes.forEach(fun::apply);
           }
         });
   }
 
-  public static final SimpleMap<List<ConfigNode>> EMPTY =
-      new WrappedSimpleMap<>(Collections.emptyMap());
+  private static class SubstitutingMap extends AbstractMap<String, String> {
+
+    private final Map<String, String> delegate;
+
+    SubstitutingMap(Map<String, String> delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public String get(Object key) {
+      return substituteVal(delegate.get(key));
+    }
+
+    @Override
+    public int size() {
+      return delegate.size();
+    }
+
+    @Override
+    public Set<String> keySet() {
+      return delegate.keySet();
+    }
+
+    @Override
+    public void forEach(BiConsumer<? super String, ? super String> action) {
+      delegate.forEach((k, v) -> action.accept(k, substituteVal(v)));
+    }
+
+    @Override
+    public Set<Entry<String, String>> entrySet() {
+      return new AbstractSet<>() {
+        @Override
+        public Iterator<Entry<String, String>> iterator() {
+          // using delegate, return an iterator using Streams
+          return delegate.entrySet().stream()
+              .map(entry -> (Entry<String, String>) new SubstitutingEntry(entry))
+              .iterator();
+        }
+
+        @Override
+        public int size() {
+          return delegate.size();
+        }
+      };
+    }
+
+    private static class SubstitutingEntry implements Entry<String, String> {
+
+      private final Entry<String, String> delegateEntry;
+
+      SubstitutingEntry(Entry<String, String> delegateEntry) {
+        this.delegateEntry = delegateEntry;
+      }
+
+      @Override
+      public String getKey() {
+        return delegateEntry.getKey();
+      }
+
+      @Override
+      public String getValue() {
+        return substituteVal(delegateEntry.getValue());
+      }
+
+      @Override
+      public String setValue(String value) {
+        throw new UnsupportedOperationException();
+      }
+    }
+  }
 }

solr/core/src/test/org/apache/solr/core/TestCodecSupport.java

@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.Set;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.lucene99.Lucene99Codec.Mode;
 import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
@@ -238,7 +239,7 @@ public void testCompressionModeDefault() throws IOException {
         config.get("codecFactory").attr("class"));
     assertTrue(
         "Unexpected configuration of codec factory for this test. Expecting empty element",
-        config.get("codecFactory").getAll(null, (String) null).isEmpty());
+        config.get("codecFactory").getAll(null, Set.of()).isEmpty());
     IndexSchema schema = IndexSchemaFactory.buildIndexSchema("schema_codec.xml", config);
 
     CoreContainer coreContainer = h.getCoreContainer();

solr/core/src/test/org/apache/solr/handler/RequestHandlerMetricsTest.java

@@ -90,11 +90,10 @@ public void testAggregateNodeLevelMetrics() throws SolrServerException, IOExcept
     final double[] minUpdateTime = {Double.MAX_VALUE};
     final double[] maxUpdateTime = {-1.0};
     Set<NamedList<Object>> coreMetrics = new HashSet<>();
-    metrics.forEachKey(
-        (key) -> {
+    metrics.forEach(
+        (key, coreMetric) -> {
           if (key.startsWith("solr.core.testRequestHandlerMetrics")) {
-            NamedList<Object> coreMetric = (NamedList<Object>) metrics.get(key);
-            coreMetrics.add(coreMetric);
+            coreMetrics.add((NamedList<Object>) coreMetric);
           }
         });
     assertEquals(2, coreMetrics.size());

solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerActionTest.java

@@ -17,7 +17,6 @@
 package org.apache.solr.handler.admin;
 
 import java.util.Locale;
-import java.util.Map;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.CoreAdminParams;
@@ -82,11 +81,11 @@ private void testAction(String action, String propertyName, String propertyValue
 
     admin.handleRequestBody(req(CoreAdminParams.ACTION, action), response);
 
-    Map<String, Object> actionResponse = ((NamedList<Object>) response.getResponse()).asMap();
+    var actionResponse = (NamedList<Object>) response.getResponse();
 
     assertTrue(
         String.format(Locale.ROOT, "Action response should contain %s property", propertyName),
-        actionResponse.containsKey(propertyName));
+        actionResponse.get(propertyName) != null);
     assertEquals(
         String.format(
             Locale.ROOT,

solr/core/src/test/org/apache/solr/search/facet/SpatialHeatmapFacetsTest.java

@@ -155,9 +155,11 @@ public void testClassicFacets() throws Exception { // AKA SimpleFacets
               .findRecursive("facet_counts", "facet_heatmaps", "course", "gridLevel"));
       assertTrue(
           ((NamedList<Object>)
-                  response.getResponse().findRecursive("facet_counts", "facet_heatmaps", "course"))
-              .asMap(0)
-              .containsKey("counts_" + courseFormat));
+                      response
+                          .getResponse()
+                          .findRecursive("facet_counts", "facet_heatmaps", "course"))
+                  .indexOf("counts_" + courseFormat, 0)
+              >= 0);
     }
 
     // ------ Index data

solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java

@@ -212,7 +212,7 @@ public static PerReplicaStatesOps disable(PerReplicaStates rs) {
         new PerReplicaStatesOps(
             prs -> {
               List<PerReplicaStates.Operation> result = new ArrayList<>();
-              prs.states.forEachEntry(
+              prs.states.forEach(
                   (s, state) ->
                       result.add(
                           new PerReplicaStates.Operation(

solr/solrj/src/java/org/apache/solr/common/ConfigNode.java

@@ -26,12 +26,11 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import org.apache.solr.cluster.api.SimpleMap;
-import org.apache.solr.common.util.WrappedSimpleMap;
 
 /**
  * A generic interface that represents a config file, mostly XML Please note that this is an
@@ -44,7 +43,7 @@ public interface ConfigNode {
   String name();
 
   /** Attributes */
-  SimpleMap<String> attributes();
+  Map<String, String> attributes();
 
   /** Child by name */
   default ConfigNode child(String name) {
@@ -195,8 +194,8 @@ public String txt() {
         }
 
         @Override
-        public SimpleMap<String> attributes() {
-          return empty_attrs;
+        public Map<String, String> attributes() {
+          return Map.of();
         }
 
         @Override
@@ -233,8 +232,6 @@ public boolean isNull() {
         public void forEachChild(Function<ConfigNode, Boolean> fun) {}
       };
 
-  SimpleMap<String> empty_attrs = new WrappedSimpleMap<>(Collections.emptyMap());
-
   class Helpers {
     static boolean _bool(Object v, boolean def) {
       return v == null ? def : Boolean.parseBoolean(v.toString());

solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java

@@ -24,7 +24,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.solr.cluster.api.HashRange;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.cloud.DocCollection.CollectionStateProps;
@@ -89,7 +88,7 @@ public static Map<String, Object> getRouterSpec(ZkNodeProps props) {
   // Hash ranges can't currently "wrap" - i.e. max must be greater or equal to min.
   // TODO: ranges may not be all contiguous in the future (either that or we will
   // need an extra class to model a collection of ranges)
-  public static class Range implements JSONWriter.Writable, Comparable<Range>, HashRange {
+  public static class Range implements JSONWriter.Writable, Comparable<Range> {
     public int min; // inclusive
     public int max; // inclusive
 
@@ -99,17 +98,14 @@ public Range(int min, int max) {
       this.max = max;
     }
 
-    @Override
     public int min() {
       return min;
     }
 
-    @Override
     public int max() {
       return max;
     }
 
-    @Override
     public boolean includes(int hash) {
       return hash >= min && hash <= max;
     }

solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java

@@ -31,14 +31,12 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
-import org.apache.solr.cluster.api.SimpleMap;
 import org.apache.solr.common.IteratorWriter;
 import org.apache.solr.common.MapWriter;
 import org.apache.solr.common.annotation.JsonProperty;
 import org.apache.solr.common.cloud.Replica.ReplicaStateProps;
 import org.apache.solr.common.util.ReflectMapWriter;
 import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.common.util.WrappedSimpleMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +57,7 @@ public class PerReplicaStates implements ReflectMapWriter {
   @JsonProperty public final int cversion;
 
   // states of individual replicas
-  @JsonProperty public final SimpleMap<State> states;
+  @JsonProperty public final Map<String, State> states;
 
   private volatile Boolean allActive;
 
@@ -85,7 +83,7 @@ public PerReplicaStates(String path, int cversion, List<String> states) {
         tmp.put(rs.replica, rs.insert(existing));
       }
     }
-    this.states = new WrappedSimpleMap<>(tmp);
+    this.states = tmp;
   }
 
   public static PerReplicaStates empty(String collectionName) {
@@ -95,27 +93,23 @@ public static PerReplicaStates empty(String collectionName) {
   /** Check and return if all replicas are ACTIVE */
   public boolean allActive() {
     if (this.allActive != null) return allActive;
-    boolean[] result = new boolean[] {true};
-    states.forEachEntry(
-        (r, s) -> {
-          if (s.state != Replica.State.ACTIVE) result[0] = false;
-        });
-    return this.allActive = result[0];
+    this.allActive = states.values().stream().allMatch(s -> s.state == Replica.State.ACTIVE);
+    return allActive;
   }
 
   /** Get the changed replicas */
   public static Set<String> findModifiedReplicas(PerReplicaStates old, PerReplicaStates fresh) {
     Set<String> result = new HashSet<>();
     if (fresh == null) {
-      old.states.forEachKey(result::add);
+      result.addAll(old.states.keySet());
       return result;
     }
-    old.states.forEachEntry(
+    old.states.forEach(
         (s, state) -> {
           // the state is modified or missing
           if (!Objects.equals(fresh.get(s), state)) result.add(s);
         });
-    fresh.states.forEachEntry(
+    fresh.states.forEach(
         (s, state) -> {
           if (old.get(s) == null) result.add(s);
         });
@@ -165,8 +159,8 @@ public String toString() {
   }
 
   private StringBuilder appendStates(StringBuilder sb) {
-    states.forEachEntry(
-        new BiConsumer<String, State>() {
+    states.forEach(
+        new BiConsumer<>() {
           int count = 0;
 
           @Override
@@ -318,7 +312,7 @@ public EntryWriter put(CharSequence k, Object v) throws IOException {
               ew.put(
                   "states",
                   (IteratorWriter)
-                      iw -> states.forEachEntry((s, state) -> iw.addNoEx(state.toString())));
+                      iw -> states.forEach((s, state) -> iw.addNoEx(state.toString())));
             } else {
               ew.put(k, v);
             }

solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java

@@ -50,7 +50,7 @@ public static Map<String, String> toMap(ConfigNode node) {
   public static Map<String, String> toMapExcept(ConfigNode node, String... exclusions) {
     Map<String, String> args = new HashMap<>();
     node.attributes()
-        .forEachEntry(
+        .forEach(
             (k, v) -> {
               for (String ex : exclusions) if (ex.equals(k)) return;
               args.put(k, v);

solr/solrj/src/java/org/apache/solr/common/util/NamedList.java

@@ -30,10 +30,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import org.apache.solr.cluster.api.SimpleMap;
 import org.apache.solr.common.MapWriter;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.MultiMapSolrParams;
@@ -61,7 +57,7 @@
  */
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class NamedList<T>
-    implements Cloneable, Serializable, Iterable<Map.Entry<String, T>>, MapWriter, SimpleMap<T> {
+    implements Cloneable, Serializable, Iterable<Map.Entry<String, T>>, MapWriter {
 
   private static final long serialVersionUID = 1957981902839867821L;
   protected final List<Object> nvPairs;
@@ -156,7 +152,6 @@ private List<Object> nameValueMapToList(Map.Entry<String, ? extends T>[] nameVal
   }
 
   /** The total number of name/value pairs */
-  @Override
   public int size() {
     return nvPairs.size() >> 1;
   }
@@ -248,11 +243,16 @@ public int indexOf(String name, int start) {
    * @see #indexOf
    * @see #get(String,int)
    */
-  @Override
   public T get(String name) {
     return get(name, 0);
   }
 
+  /** Like {@link #get(String)} but returns a default value if it would be null. */
+  public T getOrDefault(String name, T def) {
+    T val = get(name);
+    return val == null ? def : val;
+  }
+
   /**
    * Gets the value for the first instance of the specified name found starting at the specified
    * index.
@@ -486,7 +486,7 @@ public Set<Entry<String, T>> entrySet() {
 
       @Override
       public void forEach(BiConsumer action) {
-        NamedList.this.forEachEntry(action);
+        NamedList.this.forEach(action);
       }
     };
   }
@@ -818,30 +818,6 @@ public boolean equals(Object obj) {
     return this.nvPairs.equals(nl.nvPairs);
   }
 
-  @Override
-  public void abortableForEach(BiFunction<String, ? super T, Boolean> fun) {
-    int sz = size();
-    for (int i = 0; i < sz; i++) {
-      if (!fun.apply(getName(i), getVal(i))) break;
-    }
-  }
-
-  @Override
-  public void abortableForEachKey(Function<String, Boolean> fun) {
-    int sz = size();
-    for (int i = 0; i < sz; i++) {
-      if (!fun.apply(getName(i))) break;
-    }
-  }
-
-  @Override
-  public void forEachKey(Consumer<String> fun) {
-    int sz = size();
-    for (int i = 0; i < sz; i++) {
-      fun.accept(getName(i));
-    }
-  }
-
   public void forEach(BiConsumer<String, ? super T> action) {
     int sz = size();
     for (int i = 0; i < sz; i++) {
@@ -853,9 +829,4 @@ public void forEach(BiConsumer<String, ? super T> action) {
   public int _size() {
     return size();
   }
-
-  @Override
-  public void forEachEntry(BiConsumer<String, ? super T> fun) {
-    forEach(fun);
-  }
 }

solr/solrj/src/test/org/apache/solr/common/cloud/PerReplicaStatesIntegrationTest.java

@@ -164,7 +164,7 @@ public void testRestart() throws Exception {
           PerReplicaStatesOps.fetch(collectionPath, SolrCloudTestCase.cluster.getZkClient(), null);
       assertEquals(2, prs.states.size());
       c = cluster.getZkStateReader().getCollection(testCollection);
-      prs.states.forEachEntry((s, state) -> assertEquals(Replica.State.ACTIVE, state.state));
+      prs.states.forEach((s, state) -> assertEquals(Replica.State.ACTIVE, state.state));
 
       String replicaName = null;
       for (Replica r : c.getSlice("shard1").getReplicas()) {
@@ -226,7 +226,7 @@ public void testRestart() throws Exception {
         prs =
             PerReplicaStatesOps.fetch(
                 collectionPath, SolrCloudTestCase.cluster.getZkClient(), null);
-        prs.states.forEachEntry((s, state) -> assertEquals(Replica.State.ACTIVE, state.state));
+        prs.states.forEach((s, state) -> assertEquals(Replica.State.ACTIVE, state.state));
       }
 
     } finally {
@@ -286,7 +286,7 @@ public void testMultipleTransitions() throws Exception {
                 PerReplicaStates prs2 =
                     PerReplicaStatesOps.fetch(
                         DocCollection.getCollectionPath(COLL), cluster.getZkClient(), null);
-                prs2.states.forEachEntry(
+                prs2.states.forEach(
                     (r, newState) -> {
                       if (newState.getDuplicate() != null) anyFail.set(true);
                     });