Dry up some spots around map reading from StreamInput (#96853)

Mostly the keys we read are strings, lets add an overload for that
to save some code and maybe help the compiler make better decisions.
Also readMapOfLists an be way simplified, no point in duplicating
the map reading code here just to save one capturing lambda, there's
not hot code that benefits from this.

Author: original-brownbear

modules/aggregations/src/main/java/org/elasticsearch/aggregations/pipeline/BucketSelectorPipelineAggregationBuilder.java

@@ -48,7 +48,7 @@ public BucketSelectorPipelineAggregationBuilder(String name, Map<String, String>
      */
     public BucketSelectorPipelineAggregationBuilder(StreamInput in) throws IOException {
         super(in, NAME);
-        bucketsPathsMap = in.readMap(StreamInput::readString, StreamInput::readString);
+        bucketsPathsMap = in.readMap(StreamInput::readString);
         script = new Script(in);
         gapPolicy = GapPolicy.readFrom(in);
     }

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java

@@ -98,7 +98,7 @@ public static class Response extends ActionResponse implements ToXContentObject
 
         Response(StreamInput in) throws IOException {
             super(in);
-            grokPatterns = in.readMap(StreamInput::readString, StreamInput::readString);
+            grokPatterns = in.readMap(StreamInput::readString);
         }
 
         public Map<String, String> getGrokPatterns() {

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpTaskState.java

@@ -67,10 +67,7 @@ public static GeoIpTaskState fromXContent(XContentParser parser) throws IOExcept
     }
 
     GeoIpTaskState(StreamInput input) throws IOException {
-        databases = input.readImmutableMap(StreamInput::readString, in -> {
-            long lastUpdate = in.readLong();
-            return new Metadata(lastUpdate, in.readVInt(), in.readVInt(), in.readString(), in.readLong());
-        });
+        databases = input.readImmutableMap(in -> new Metadata(in.readLong(), in.readVInt(), in.readVInt(), in.readString(), in.readLong()));
     }
 
     public GeoIpTaskState put(String name, Metadata metadata) {

server/src/main/java/org/elasticsearch/ElasticsearchException.java

@@ -145,8 +145,8 @@ public ElasticsearchException(String msg, Throwable cause, Object... args) {
     public ElasticsearchException(StreamInput in) throws IOException {
         super(in.readOptionalString(), in.readException());
         readStackTrace(this, in);
-        headers.putAll(in.readMapOfLists(StreamInput::readString, StreamInput::readString));
-        metadata.putAll(in.readMapOfLists(StreamInput::readString, StreamInput::readString));
+        headers.putAll(in.readMapOfLists(StreamInput::readString));
+        metadata.putAll(in.readMapOfLists(StreamInput::readString));
     }
 
     /**

server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/DesiredBalanceResponse.java

@@ -61,7 +61,7 @@ public static DesiredBalanceResponse from(StreamInput in) throws IOException {
             in.getTransportVersion().onOrAfter(CLUSTER_BALANCE_STATS_VERSION)
                 ? ClusterBalanceStats.readFrom(in)
                 : ClusterBalanceStats.EMPTY,
-            in.readImmutableMap(StreamInput::readString, v -> v.readImmutableMap(StreamInput::readVInt, DesiredShards::from)),
+            in.readImmutableMap(v -> v.readImmutableMap(StreamInput::readVInt, DesiredShards::from)),
             in.getTransportVersion().onOrAfter(CLUSTER_INFO_VERSION) ? new ClusterInfo(in) : ClusterInfo.EMPTY
         );
     }

server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsResponse.java

@@ -30,7 +30,7 @@ public ClusterSearchShardsResponse(StreamInput in) throws IOException {
         super(in);
         groups = in.readArray(ClusterSearchShardsGroup::new, ClusterSearchShardsGroup[]::new);
         nodes = in.readArray(DiscoveryNode::new, DiscoveryNode[]::new);
-        indicesAndFilters = in.readMap(StreamInput::readString, AliasFilter::readFrom);
+        indicesAndFilters = in.readMap(AliasFilter::readFrom);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsResponse.java

@@ -94,7 +94,7 @@ public GetSnapshotsResponse(
     public GetSnapshotsResponse(StreamInput in) throws IOException {
         this.snapshots = in.readImmutableList(SnapshotInfo::readFrom);
         if (in.getTransportVersion().onOrAfter(GetSnapshotsRequest.MULTIPLE_REPOSITORIES_SUPPORT_ADDED)) {
-            final Map<String, ElasticsearchException> failedResponses = in.readMap(StreamInput::readString, StreamInput::readException);
+            final Map<String, ElasticsearchException> failedResponses = in.readMap(StreamInput::readException);
             this.failures = Collections.unmodifiableMap(failedResponses);
             this.next = in.readOptionalString();
         } else {

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/shard/GetShardSnapshotResponse.java

@@ -34,7 +34,7 @@ public class GetShardSnapshotResponse extends ActionResponse {
     GetShardSnapshotResponse(StreamInput in) throws IOException {
         super(in);
         this.latestShardSnapshot = in.readOptionalWriteable(ShardSnapshotInfo::new);
-        this.repositoryFailures = in.readMap(StreamInput::readString, RepositoryException::new);
+        this.repositoryFailures = in.readMap(RepositoryException::new);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/SearchUsageStats.java

@@ -51,8 +51,8 @@ public SearchUsageStats(Map<String, Long> queries, Map<String, Long> sections, l
     }
 
     public SearchUsageStats(StreamInput in) throws IOException {
-        this.queries = in.readMap(StreamInput::readString, StreamInput::readLong);
-        this.sections = in.readMap(StreamInput::readString, StreamInput::readLong);
+        this.queries = in.readMap(StreamInput::readLong);
+        this.sections = in.readMap(StreamInput::readLong);
         this.totalSearchCount = in.readVLong();
     }
 

server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesResponse.java

@@ -32,7 +32,7 @@ public GetAliasesResponse(Map<String, List<AliasMetadata>> aliases, Map<String,
     public GetAliasesResponse(StreamInput in) throws IOException {
         super(in);
         aliases = in.readImmutableOpenMap(StreamInput::readString, i -> i.readList(AliasMetadata::new));
-        dataStreamAliases = in.readMap(StreamInput::readString, in1 -> in1.readList(DataStreamAlias::new));
+        dataStreamAliases = in.readMap(in1 -> in1.readList(DataStreamAlias::new));
     }
 
     public Map<String, List<AliasMetadata>> getAliases() {