Make StreamOutput.writeMap generic (#84593)

The writeMap method currently is meant for a string to object map, and all
it does it delegate to writeGenericObject. This change converts existing
uses of writeMap to use writeGenericObject directly, and adds a new
generic version of writeMap to parallel the writeMap which takes key and
value writers.

modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/ArrayValuesSourceAggregationBuilder.java

@@ -117,7 +117,7 @@ protected final void doWriteTo(StreamOutput out) throws IOException {
         out.writeGenericValue(fields);
         out.writeOptionalWriteable(userValueTypeHint);
         out.writeOptionalString(format);
-        out.writeMap(missingMap);
+        out.writeGenericMap(missingMap);
         innerWriteTo(out);
     }
 

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java

@@ -228,7 +228,7 @@ public void writeTo(StreamOutput out) throws IOException {
         boolean hasParams = scriptParams != null;
         out.writeBoolean(hasParams);
         if (hasParams) {
-            out.writeMap(scriptParams);
+            out.writeGenericMap(scriptParams);
         }
     }
 }

modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java

@@ -197,7 +197,7 @@ public void writeTo(StreamOutput out) throws IOException {
         for (RatedDocument ratedDoc : ratedDocs) {
             ratedDoc.writeTo(out);
         }
-        out.writeMap(params);
+        out.writeGenericMap(params);
         out.writeInt(summaryFields.size());
         for (String fieldName : summaryFields) {
             out.writeString(fieldName);

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java

@@ -121,7 +121,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeBoolean(includeGlobalState);
         out.writeBoolean(waitForCompletion);
         out.writeBoolean(partial);
-        out.writeMap(userMetadata);
+        out.writeGenericMap(userMetadata);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java

@@ -128,7 +128,7 @@ public void writeTo(StreamOutput out) throws IOException {
         OriginalIndices.writeOriginalIndices(originalIndices, out);
         out.writeOptionalNamedWriteable(indexFilter);
         out.writeLong(nowInMillis);
-        out.writeMap(runtimeFields);
+        out.writeGenericMap(runtimeFields);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java

@@ -92,7 +92,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeBoolean(includeUnmapped);
         out.writeOptionalNamedWriteable(indexFilter);
         out.writeOptionalLong(nowInMillis);
-        out.writeMap(runtimeFields);
+        out.writeGenericMap(runtimeFields);
         if (out.getVersion().onOrAfter(Version.V_8_2_0)) {
             out.writeStringArray(filters);
             out.writeStringArray(allowedTypes);

server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java

@@ -94,8 +94,8 @@ final class WriteableIngestDocument implements Writeable, ToXContentFragment {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeMap(ingestDocument.getSourceAndMetadata());
-        out.writeMap(ingestDocument.getIngestMetadata());
+        out.writeGenericMap(ingestDocument.getSourceAndMetadata());
+        out.writeGenericMap(ingestDocument.getIngestMetadata());
     }
 
     IngestDocument getIngestDocument() {

server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java

@@ -1297,7 +1297,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeImmutableMap(shards);
             out.writeLong(repositoryStateId);
             out.writeOptionalString(failure);
-            out.writeMap(userMetadata);
+            out.writeGenericMap(userMetadata);
             Version.writeVersion(version, out);
             out.writeStringCollection(dataStreams);
             out.writeOptionalWriteable(source);

server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java

@@ -100,7 +100,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeBoolean(false);
         } else {
             out.writeBoolean(true);
-            out.writeMap(this.metadata);
+            out.writeGenericMap(this.metadata);
         }
     }
 

server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java

@@ -218,7 +218,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalStringCollection(this.componentTemplates);
         out.writeOptionalVLong(this.priority);
         out.writeOptionalVLong(this.version);
-        out.writeMap(this.metadata);
+        out.writeGenericMap(this.metadata);
         out.writeOptionalWriteable(dataStreamTemplate);
         out.writeOptionalBoolean(allowAutoCreate);
     }

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

@@ -602,7 +602,7 @@ public void writeTo(StreamOutput out) throws IOException {
         timeStampField.writeTo(out);
         out.writeList(indices);
         out.writeVLong(generation);
-        out.writeMap(metadata);
+        out.writeGenericMap(metadata);
         out.writeBoolean(hidden);
         out.writeBoolean(replicated);
         out.writeBoolean(system);

server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java

@@ -60,7 +60,7 @@ public boolean containsKey(Object key) {
     @Override
     @SuppressWarnings("unchecked")
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeMap((Map<String, Object>) (Map) innerMap);
+        out.writeGenericMap((Map<String, Object>) (Map) innerMap);
     }
 
     @Override

server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java

@@ -516,7 +516,7 @@ public void writeOptionalStringArray(@Nullable String[] array) throws IOExceptio
         }
     }
 
-    public void writeMap(@Nullable Map<String, Object> map) throws IOException {
+    public void writeGenericMap(@Nullable Map<String, Object> map) throws IOException {
         writeGenericValue(map);
     }
 
@@ -579,6 +579,13 @@ public final <K, V> void writeMapOfLists(final Map<K, List<V>> map, final Writer
         });
     }
 
+    /**
+     * Write a {@link Map} of {@code K}-type keys to {@code V}-type.
+     */
+    public final <K extends Writeable, V extends Writeable> void writeMap(final Map<K, V> map) throws IOException {
+        writeMap(map, (o, k) -> k.writeTo(o), (o, v) -> v.writeTo(o));
+    }
+
     /**
      * Write a {@link Map} of {@code K}-type keys to {@code V}-type.
      * <pre><code>

server/src/main/java/org/elasticsearch/script/StoredScriptSource.java

@@ -302,7 +302,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(source);
         @SuppressWarnings("unchecked")
         Map<String, Object> options = (Map<String, Object>) (Map) this.options;
-        out.writeMap(options);
+        out.writeGenericMap(options);
     }
 
     /**

server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java

@@ -55,7 +55,7 @@ protected AbstractAggregationBuilder(StreamInput in) throws IOException {
     public final void writeTo(StreamOutput out) throws IOException {
         out.writeString(name);
         factoriesBuilder.writeTo(out);
-        out.writeMap(metadata);
+        out.writeGenericMap(metadata);
         doWriteTo(out);
     }
 

server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java

@@ -118,7 +118,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         out.writeVInt(size);
         out.writeBoolean(after != null);
         if (after != null) {
-            out.writeMap(after);
+            out.writeGenericMap(after);
         }
     }
 

server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java

@@ -106,7 +106,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         boolean hasParams = params != null;
         out.writeBoolean(hasParams);
         if (hasParams) {
-            out.writeMap(params);
+            out.writeGenericMap(params);
         }
     }
 

server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java

@@ -52,7 +52,7 @@ protected AbstractPipelineAggregationBuilder(StreamInput in, String type) throws
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(name);
         out.writeStringArray(bucketsPaths);
-        out.writeMap(metadata);
+        out.writeGenericMap(metadata);
         doWriteTo(out);
     }
 

server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java

@@ -313,7 +313,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeOptionalWriteable(pointInTimeBuilder);
         }
         if (out.getVersion().onOrAfter(Version.V_7_11_0)) {
-            out.writeMap(runtimeMappings);
+            out.writeGenericMap(runtimeMappings);
         } else {
             if (false == runtimeMappings.isEmpty()) {
                 throw new IllegalArgumentException(

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java

@@ -202,7 +202,7 @@ public final void writeTo(StreamOutput out) throws IOException {
         boolean hasOptions = options != null;
         out.writeBoolean(hasOptions);
         if (hasOptions) {
-            out.writeMap(options);
+            out.writeGenericMap(options);
         }
         out.writeOptionalBoolean(requireFieldMatch);
         if (out.getVersion().onOrAfter(Version.V_7_12_0)) {

server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java

@@ -1017,7 +1017,7 @@ public void writeTo(final StreamOutput out) throws IOException {
             out.writeBoolean(false);
         }
         out.writeOptionalBoolean(includeGlobalState);
-        out.writeMap(userMetadata);
+        out.writeGenericMap(userMetadata);
         out.writeStringCollection(dataStreams);
         out.writeList(featureStates);
 

server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskState.java

@@ -113,7 +113,7 @@ public String getWriteableName() {
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(currentIndex);
         out.writeString(currentFeature);
-        out.writeMap(featureCallbackMetadata);
+        out.writeGenericMap(featureCallbackMetadata);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java

@@ -385,7 +385,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeBoolean(available);
                 out.writeBoolean(enabled);
                 if (out.getVersion().before(Version.V_8_0_0)) {
-                    out.writeMap(Collections.emptyMap());
+                    out.writeGenericMap(Collections.emptyMap());
                 }
             }
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationIssue.java

@@ -143,7 +143,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(url);
         out.writeOptionalString(details);
         out.writeBoolean(resolveDuringRollingUpgrade);
-        out.writeMap(meta);
+        out.writeGenericMap(meta);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/eql/EqlFeatureSetUsage.java

@@ -48,7 +48,7 @@ protected void innerXContent(XContentBuilder builder, Params params) throws IOEx
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        out.writeMap(stats);
+        out.writeGenericMap(stats);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java

@@ -139,7 +139,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeNamedWriteable(type);
         out.writeString(name);
         out.writeMap(phases, StreamOutput::writeString, (o, val) -> val.writeTo(o));
-        out.writeMap(this.metadata);
+        out.writeGenericMap(this.metadata);
     }
 
     /**

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java

@@ -71,10 +71,10 @@ public Version getMinimalSupportedVersion() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        out.writeMap(jobsUsage);
-        out.writeMap(datafeedsUsage);
-        out.writeMap(analyticsUsage);
-        out.writeMap(inferenceUsage);
+        out.writeGenericMap(jobsUsage);
+        out.writeGenericMap(datafeedsUsage);
+        out.writeGenericMap(analyticsUsage);
+        out.writeGenericMap(inferenceUsage);
         out.writeInt(nodeCount);
     }
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java

@@ -150,7 +150,7 @@ public ActionRequestValidationException validate() {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(deploymentId);
-            out.writeCollection(docs, StreamOutput::writeMap);
+            out.writeCollection(docs, StreamOutput::writeGenericMap);
             out.writeOptionalNamedWriteable(update);
             out.writeOptionalTimeValue(inferenceTimeout);
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InternalInferModelAction.java

@@ -98,7 +98,7 @@ public ActionRequestValidationException validate() {
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeString(modelId);
-            out.writeCollection(objectsToInfer, StreamOutput::writeMap);
+            out.writeCollection(objectsToInfer, StreamOutput::writeGenericMap);
             out.writeNamedWriteable(update);
             out.writeBoolean(previouslyLicensed);
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java

@@ -68,7 +68,7 @@ public Map<String, Object> getInfo() {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            out.writeMap(info);
+            out.writeGenericMap(info);
         }
 
         @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java

@@ -142,7 +142,7 @@ public List<Map<String, Object>> getFeatureValues() {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            out.writeCollection(featureValues, StreamOutput::writeMap);
+            out.writeCollection(featureValues, StreamOutput::writeGenericMap);
         }
 
         @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java

@@ -137,7 +137,7 @@ static AggProvider fromStream(StreamInput in) throws IOException {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeMap(aggs);
+        out.writeGenericMap(aggs);
         out.writeOptionalWriteable(parsedAggs);
         out.writeException(parsingException);
         if (out.getVersion().onOrAfter(Version.V_8_0_0)) {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java

@@ -538,7 +538,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalWriteable(delayedDataCheckConfig);
         out.writeOptionalVInt(maxEmptySearches);
         indicesOptions.writeIndicesOptions(out);
-        out.writeMap(runtimeMappings);
+        out.writeGenericMap(runtimeMappings);
     }
 
     @Override
@@ -844,7 +844,7 @@ public void writeTo(StreamOutput out) throws IOException {
             if (indicesOptions != null) {
                 indicesOptions.writeIndicesOptions(out);
             }
-            out.writeMap(runtimeMappings);
+            out.writeGenericMap(runtimeMappings);
         }
 
         @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java

@@ -210,7 +210,7 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         if (this.runtimeMappings != null) {
             out.writeBoolean(true);
-            out.writeMap(this.runtimeMappings);
+            out.writeGenericMap(this.runtimeMappings);
         } else {
             out.writeBoolean(false);
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java

@@ -127,7 +127,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeStringArray(index);
         queryProvider.writeTo(out);
         out.writeOptionalWriteable(sourceFiltering);
-        out.writeMap(runtimeMappings);
+        out.writeGenericMap(runtimeMappings);
     }
 
     @Override

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java

@@ -382,7 +382,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeInstant(createTime);
         out.writeOptionalWriteable(definition);
         out.writeCollection(tags, StreamOutput::writeString);
-        out.writeMap(metadata);
+        out.writeGenericMap(metadata);
         input.writeTo(out);
         out.writeVLong(modelSize);
         out.writeVLong(estimatedOperations);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java

@@ -573,7 +573,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalLong(modelSnapshotRetentionDays);
         out.writeOptionalLong(dailyModelSnapshotRetentionAfterDays);
         out.writeOptionalLong(resultsRetentionDays);
-        out.writeMap(customSettings);
+        out.writeGenericMap(customSettings);
         out.writeOptionalString(modelSnapshotId);
         if (modelSnapshotMinVersion != null) {
             out.writeBoolean(true);
@@ -1070,7 +1070,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeOptionalLong(modelSnapshotRetentionDays);
             out.writeOptionalLong(dailyModelSnapshotRetentionAfterDays);
             out.writeOptionalLong(resultsRetentionDays);
-            out.writeMap(customSettings);
+            out.writeGenericMap(customSettings);
             out.writeOptionalString(modelSnapshotId);
             if (modelSnapshotMinVersion != null) {
                 out.writeBoolean(true);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java

@@ -219,7 +219,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeStringCollection(categorizationFilters);
         }
         out.writeOptionalWriteable(perPartitionCategorizationConfig);
-        out.writeMap(customSettings);
+        out.writeGenericMap(customSettings);
         out.writeOptionalString(modelSnapshotId);
         if (jobVersion != null) {
             out.writeBoolean(true);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/QueryProvider.java

@@ -87,7 +87,7 @@ public QueryProvider(QueryProvider other) {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeMap(query);
+        out.writeGenericMap(query);
         out.writeOptionalNamedWriteable(parsedQuery);
         out.writeException(parsingException);
     }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java

@@ -49,7 +49,7 @@ public Map<String, Object> getExporters() {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        out.writeMap(exporters);
+        out.writeGenericMap(exporters);
         out.writeOptionalBoolean(collectionEnabled);
     }