From af916a05494d134c965759815139711ec8518634 Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 8 Jan 2024 13:05:53 +0000 Subject: [PATCH] Rename `StreamInput#readGenericMap` (#104045) `StreamInput#readMap()` is quite different from the other `readMap` overloads, and pairs up with `StreamOutput#writeGenericMap`. This commit renames it to avoid accidental misuse and so that the names line up better between writer and reader. --- .../ArrayValuesSourceAggregationBuilder.java | 2 +- .../mustache/SearchTemplateRequest.java | 2 +- .../index/rankeval/RatedRequest.java | 2 +- .../create/CreateSnapshotRequest.java | 2 +- .../admin/indices/analyze/AnalyzeAction.java | 2 +- .../FieldCapabilitiesNodeRequest.java | 2 +- .../fieldcaps/FieldCapabilitiesRequest.java | 2 +- .../ingest/WriteableIngestDocument.java | 2 +- .../termvectors/TermVectorsRequest.java | 2 +- .../cluster/SnapshotsInProgress.java | 2 +- .../cluster/metadata/ComponentTemplate.java | 2 +- .../metadata/ComposableIndexTemplate.java | 2 +- .../cluster/metadata/DataStream.java | 2 +- .../cluster/metadata/DiffableStringMap.java | 2 +- .../common/io/stream/StreamInput.java | 2 +- .../java/org/elasticsearch/script/Script.java | 4 +-- .../script/StoredScriptSource.java | 2 +- .../AbstractAggregationBuilder.java | 2 +- .../aggregations/InternalAggregation.java | 2 +- .../CompositeAggregationBuilder.java | 2 +- .../ScriptedMetricAggregationBuilder.java | 2 +- .../AbstractPipelineAggregationBuilder.java | 2 +- .../search/builder/SearchSourceBuilder.java | 2 +- .../highlight/AbstractHighlighterBuilder.java | 2 +- .../phrase/PhraseSuggestionBuilder.java | 2 +- .../elasticsearch/snapshots/SnapshotInfo.java | 2 +- .../SystemIndexMigrationTaskState.java | 2 +- .../common/io/stream/BytesStreamsTests.java | 2 +- .../RecyclerBytesStreamOutputTests.java | 2 +- .../protocol/xpack/XPackInfoResponse.java | 2 +- .../xpack/core/HealthApiFeatureSetUsage.java | 2 +- .../EnterpriseSearchFeatureSetUsage.java | 8 +++--- .../core/deprecation/DeprecationIssue.java | 2 +- .../xpack/core/eql/EqlFeatureSetUsage.java | 2 +- .../xpack/core/esql/EsqlFeatureSetUsage.java | 2 +- .../xpack/core/ilm/LifecyclePolicy.java | 2 +- .../inference/action/InferenceAction.java | 2 +- .../ml/MachineLearningFeatureSetUsage.java | 8 +++--- .../ml/action/CoordinatedInferenceAction.java | 4 +-- .../core/ml/action/InferModelAction.java | 2 +- .../InferTrainedModelDeploymentAction.java | 2 +- .../xpack/core/ml/action/MlInfoAction.java | 2 +- .../PreviewDataFrameAnalyticsAction.java | 2 +- .../xpack/core/ml/datafeed/AggProvider.java | 2 +- .../core/ml/datafeed/DatafeedConfig.java | 4 +-- .../core/ml/datafeed/DatafeedUpdate.java | 2 +- .../dataframe/DataFrameAnalyticsConfig.java | 2 +- .../DataFrameAnalyticsConfigUpdate.java | 2 +- .../dataframe/DataFrameAnalyticsSource.java | 2 +- .../core/ml/inference/TrainedModelConfig.java | 2 +- .../trainedmodel/LearningToRankConfig.java | 2 +- .../trainedmodel/ModelPackageConfig.java | 4 +-- .../xpack/core/ml/job/config/Job.java | 4 +-- .../xpack/core/ml/job/config/JobUpdate.java | 2 +- .../xpack/core/ml/utils/QueryProvider.java | 2 +- .../monitoring/MonitoringFeatureSetUsage.java | 2 +- .../core/rollup/action/RollupJobCaps.java | 2 +- .../core/rollup/job/RollupJobStatus.java | 2 +- .../security/SecurityFeatureSetUsage.java | 28 +++++++++---------- .../core/security/action/apikey/ApiKey.java | 2 +- .../apikey/BaseUpdateApiKeyRequest.java | 2 +- .../action/apikey/CreateApiKeyRequest.java | 2 +- .../CreateCrossClusterApiKeyRequest.java | 2 +- .../core/security/action/profile/Profile.java | 10 ++++++- .../profile/UpdateProfileDataRequest.java | 4 +-- .../security/action/role/PutRoleRequest.java | 2 +- .../rolemapping/PutRoleMappingRequest.java | 2 +- .../UpdateSecuritySettingsAction.java | 6 ++-- .../security/action/user/PutUserRequest.java | 2 +- .../core/security/authc/Authentication.java | 4 +-- .../support/mapper/ExpressionRoleMapping.java | 2 +- .../core/security/authz/RoleDescriptor.java | 4 +-- .../ApplicationPrivilegeDescriptor.java | 2 +- .../core/slm/SnapshotLifecyclePolicy.java | 2 +- .../xpack/core/sql/SqlFeatureSetUsage.java | 2 +- .../structurefinder/FieldStats.java | 2 +- .../structurefinder/TextStructure.java | 4 +-- .../action/PreviewTransformAction.java | 2 +- .../transform/transforms/QueryConfig.java | 2 +- .../transform/transforms/SourceConfig.java | 2 +- .../transforms/TransformCheckpoint.java | 2 +- .../transform/transforms/TransformConfig.java | 2 +- .../transforms/TransformConfigUpdate.java | 2 +- .../TransformDestIndexSettings.java | 2 +- .../transforms/TransformIndexerPosition.java | 4 +-- .../transform/transforms/TransformState.java | 2 +- .../transforms/pivot/AggregationConfig.java | 2 +- .../transforms/pivot/GroupConfig.java | 2 +- .../transforms/pivot/ScriptConfig.java | 2 +- .../core/watcher/WatcherFeatureSetUsage.java | 2 +- .../actions/execute/ExecuteWatchRequest.java | 4 +-- .../put/UpdateWatcherSettingsAction.java | 2 +- .../xpack/application/rules/QueryRule.java | 2 +- .../application/rules/RuleQueryBuilder.java | 2 +- .../SearchApplicationSearchRequest.java | 2 +- .../xpack/eql/action/EqlSearchRequest.java | 2 +- .../execution/sample/CircuitBreakerTests.java | 2 +- .../SamlValidateAuthnRequestResponse.java | 2 +- .../ltr/LearningToRankRescorerBuilder.java | 2 +- .../xpack/security/authc/UserToken.java | 2 +- .../slm/history/SnapshotHistoryItem.java | 2 +- .../sql/action/AbstractSqlQueryRequest.java | 2 +- .../sql/execution/search/PivotCursor.java | 2 +- 103 files changed, 143 insertions(+), 135 deletions(-) diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSourceAggregationBuilder.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSourceAggregationBuilder.java index d578aeff28011..0f277ecd6c478 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSourceAggregationBuilder.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSourceAggregationBuilder.java @@ -110,7 +110,7 @@ private void read(StreamInput in) throws IOException { fields = (ArrayList) in.readGenericValue(); userValueTypeHint = in.readOptionalWriteable(ValueType::readFromStream); format = in.readOptionalString(); - missingMap = in.readMap(); + missingMap = in.readGenericMap(); } @Override diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java index 6cc7f47511cb1..8145c586c402d 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java @@ -54,7 +54,7 @@ public SearchTemplateRequest(StreamInput in) throws IOException { scriptType = ScriptType.readFrom(in); script = in.readOptionalString(); if (in.readBoolean()) { - scriptParams = in.readMap(); + scriptParams = in.readGenericMap(); } } diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java index cf97c78bb4d64..934b89fb3f668 100644 --- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java +++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RatedRequest.java @@ -179,7 +179,7 @@ static void validateEvaluatedQuery(SearchSourceBuilder evaluationRequest) { for (int i = 0; i < intentSize; i++) { ratedDocs.add(new RatedDocument(in)); } - this.params = in.readMap(); + this.params = in.readGenericMap(); int summaryFieldsSize = in.readInt(); summaryFields = new ArrayList<>(summaryFieldsSize); for (int i = 0; i < summaryFieldsSize; i++) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java index 7c5d11a884d60..2e8a28d412e26 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java @@ -104,7 +104,7 @@ public CreateSnapshotRequest(StreamInput in) throws IOException { includeGlobalState = in.readBoolean(); waitForCompletion = in.readBoolean(); partial = in.readBoolean(); - userMetadata = in.readMap(); + userMetadata = in.readGenericMap(); } @Override diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java index 8a674292b3cc5..6c5a271c3338b 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java @@ -441,7 +441,7 @@ public AnalyzeToken( positionLength = 1; } type = in.readOptionalString(); - attributes = in.readMap(); + attributes = in.readGenericMap(); } public String getTerm() { diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java index ba238638efba4..87d09acfe3a42 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java @@ -54,7 +54,7 @@ class FieldCapabilitiesNodeRequest extends ActionRequest implements IndicesReque originalIndices = OriginalIndices.readOriginalIndices(in); indexFilter = in.readOptionalNamedWriteable(QueryBuilder.class); nowInMillis = in.readLong(); - runtimeFields = in.readMap(); + runtimeFields = in.readGenericMap(); } FieldCapabilitiesNodeRequest( diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java index 95555cfd59ab2..0bb7833911993 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java @@ -57,7 +57,7 @@ public FieldCapabilitiesRequest(StreamInput in) throws IOException { includeUnmapped = in.readBoolean(); indexFilter = in.readOptionalNamedWriteable(QueryBuilder.class); nowInMillis = in.readOptionalLong(); - runtimeFields = in.readMap(); + runtimeFields = in.readGenericMap(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { filters = in.readStringArray(); types = in.readStringArray(); diff --git a/server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java b/server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java index a77d0bf7e2b01..a8fb51b30713c 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java @@ -103,7 +103,7 @@ private WriteableIngestDocument(Map sourceAndMetadata, Map shards = in.readImmutableMap(ShardId::new, ShardSnapshotStatus::readFrom); final long repositoryStateId = in.readLong(); final String failure = in.readOptionalString(); - final Map userMetadata = in.readMap(); + final Map userMetadata = in.readGenericMap(); final IndexVersion version = IndexVersion.readVersion(in); final List dataStreams = in.readStringCollectionAsImmutableList(); final SnapshotId source = in.readOptionalWriteable(SnapshotId::new); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java index dac5005e0e043..8b5548c9ea8ef 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplate.java @@ -88,7 +88,7 @@ public ComponentTemplate(StreamInput in) throws IOException { this.template = new Template(in); this.version = in.readOptionalVLong(); if (in.readBoolean()) { - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); } else { this.metadata = null; } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java index a0dd7bc3e9eef..2cc09beffa28a 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplate.java @@ -145,7 +145,7 @@ public ComposableIndexTemplate(StreamInput in) throws IOException { this.componentTemplates = in.readOptionalStringCollectionAsList(); this.priority = in.readOptionalVLong(); this.version = in.readOptionalVLong(); - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); this.dataStreamTemplate = in.readOptionalWriteable(DataStreamTemplate::new); this.allowAutoCreate = in.readOptionalBoolean(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_7_0)) { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java index 35f66f2848f5f..f5a3751402d91 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java @@ -859,7 +859,7 @@ public DataStream(StreamInput in) throws IOException { readName(in), readIndices(in), in.readVLong(), - in.readMap(), + in.readGenericMap(), in.readBoolean(), in.readBoolean(), in.readBoolean(), diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java index 7c74014a1da2e..51a66ab094591 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DiffableStringMap.java @@ -34,7 +34,7 @@ public class DiffableStringMap extends AbstractMap implements Di @SuppressWarnings("unchecked") public static DiffableStringMap readFrom(StreamInput in) throws IOException { - final Map map = (Map) in.readMap(); + final Map map = (Map) in.readGenericMap(); return map.isEmpty() ? EMPTY : new DiffableStringMap(map); } diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java index 96240dd053edb..c4f0dc58f5ffd 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java @@ -694,7 +694,7 @@ public Map readMapValues(final Writeable.Reader valueReader, fin */ @Nullable @SuppressWarnings("unchecked") - public Map readMap() throws IOException { + public Map readGenericMap() throws IOException { return (Map) readGenericValue(); } diff --git a/server/src/main/java/org/elasticsearch/script/Script.java b/server/src/main/java/org/elasticsearch/script/Script.java index 7529cb01f2081..ced4b0158f62d 100644 --- a/server/src/main/java/org/elasticsearch/script/Script.java +++ b/server/src/main/java/org/elasticsearch/script/Script.java @@ -556,9 +556,9 @@ public Script(StreamInput in) throws IOException { this.lang = in.readOptionalString(); this.idOrCode = in.readString(); @SuppressWarnings("unchecked") - Map options = (Map) (Map) in.readMap(); + Map options = (Map) (Map) in.readGenericMap(); this.options = options; - this.params = in.readMap(); + this.params = in.readGenericMap(); } @Override diff --git a/server/src/main/java/org/elasticsearch/script/StoredScriptSource.java b/server/src/main/java/org/elasticsearch/script/StoredScriptSource.java index 2ea8f964fbb2b..e5747e4ccff40 100644 --- a/server/src/main/java/org/elasticsearch/script/StoredScriptSource.java +++ b/server/src/main/java/org/elasticsearch/script/StoredScriptSource.java @@ -289,7 +289,7 @@ public StoredScriptSource(StreamInput in) throws IOException { this.lang = in.readString(); this.source = in.readString(); @SuppressWarnings("unchecked") - Map options = (Map) (Map) in.readMap(); + Map options = (Map) (Map) in.readGenericMap(); this.options = options; } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java index f22b71c86dd11..494436e5c2052 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/AbstractAggregationBuilder.java @@ -48,7 +48,7 @@ protected AbstractAggregationBuilder( protected AbstractAggregationBuilder(StreamInput in) throws IOException { super(in.readString()); factoriesBuilder = new AggregatorFactories.Builder(in); - metadata = in.readMap(); + metadata = in.readGenericMap(); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java index 52f3dba1ccdd5..3def930f9e296 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java @@ -50,7 +50,7 @@ protected InternalAggregation(String name, Map metadata) { */ protected InternalAggregation(StreamInput in) throws IOException { name = in.readString(); - metadata = in.readMap(); + metadata = in.readGenericMap(); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java index 59fec0dd1540a..b078b62c4b82d 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java @@ -108,7 +108,7 @@ public CompositeAggregationBuilder(StreamInput in) throws IOException { } this.size = in.readVInt(); if (in.readBoolean()) { - this.after = in.readMap(); + this.after = in.readGenericMap(); } } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java index 487cc2bd11bd3..337afe3fbeebd 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregationBuilder.java @@ -94,7 +94,7 @@ public ScriptedMetricAggregationBuilder(StreamInput in) throws IOException { combineScript = in.readOptionalWriteable(Script::new); reduceScript = in.readOptionalWriteable(Script::new); if (in.readBoolean()) { - params = in.readMap(); + params = in.readGenericMap(); } } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java index b3335dcbd5be5..0d901eaa1dc97 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java @@ -45,7 +45,7 @@ protected AbstractPipelineAggregationBuilder(String name, String type, String[] */ protected AbstractPipelineAggregationBuilder(StreamInput in, String type) throws IOException { this(in.readString(), type, in.readStringArray()); - metadata = in.readMap(); + metadata = in.readGenericMap(); } @Override diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index c7077e4c867b0..0211e43933ec3 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -260,7 +260,7 @@ public SearchSourceBuilder(StreamInput in) throws IOException { fetchFields = in.readCollectionAsList(FieldAndFormat::new); } pointInTimeBuilder = in.readOptionalWriteable(PointInTimeBuilder::new); - runtimeMappings = in.readMap(); + runtimeMappings = in.readGenericMap(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_4_0)) { if (in.getTransportVersion().before(TransportVersions.V_8_7_0)) { KnnSearchBuilder searchBuilder = in.readOptionalWriteable(KnnSearchBuilder::new); diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java index 5a26191b8eeec..d91b6e8b4e4a3 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java @@ -158,7 +158,7 @@ protected AbstractHighlighterBuilder(StreamInput in) throws IOException { noMatchSize(in.readOptionalVInt()); phraseLimit(in.readOptionalVInt()); if (in.readBoolean()) { - options(in.readMap()); + options(in.readGenericMap()); } requireFieldMatch(in.readOptionalBoolean()); maxAnalyzedOffset(in.readOptionalInt()); diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java index 10525d7dc89d9..fe1502f53d9b6 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java @@ -127,7 +127,7 @@ public PhraseSuggestionBuilder(StreamInput in) throws IOException { if (in.readBoolean()) { collateQuery = new Script(in); } - collateParams = in.readMap(); + collateParams = in.readGenericMap(); collatePrune = in.readOptionalBoolean(); int generatorsEntries = in.readVInt(); for (int i = 0; i < generatorsEntries; i++) { diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java index 6414e0d2f1779..c09719ec48039 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java +++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotInfo.java @@ -512,7 +512,7 @@ public static SnapshotInfo readFrom(final StreamInput in) throws IOException { final List shardFailures = in.readCollectionAsImmutableList(SnapshotShardFailure::new); final IndexVersion version = in.readBoolean() ? IndexVersion.readVersion(in) : null; final Boolean includeGlobalState = in.readOptionalBoolean(); - final Map userMetadata = in.readMap(); + final Map userMetadata = in.readGenericMap(); final List dataStreams = in.readStringCollectionAsImmutableList(); final List featureStates = in.readCollectionAsImmutableList(SnapshotFeatureInfo::new); final Map indexSnapshotDetails = in.readImmutableMap(IndexSnapshotDetails::new); diff --git a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskState.java b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskState.java index 39c60e1224cf9..51e97cc193ec3 100644 --- a/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskState.java +++ b/server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskState.java @@ -62,7 +62,7 @@ public SystemIndexMigrationTaskState(String currentIndex, String currentFeature, public SystemIndexMigrationTaskState(StreamInput in) throws IOException { this.currentIndex = in.readString(); this.currentFeature = in.readString(); - this.featureCallbackMetadata = in.readMap(); + this.featureCallbackMetadata = in.readGenericMap(); } /** diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java index 0e54a9a49aa00..f60a5a5fc601a 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java @@ -692,7 +692,7 @@ public void testReadMapByUsingWriteMapWithConsistentOrder() throws IOException { try (TestStreamOutput streamOut = new TestStreamOutput()) { streamOut.writeMapWithConsistentOrder(streamOutMap); StreamInput in = StreamInput.wrap(BytesReference.toBytes(streamOut.bytes())); - Map streamInMap = in.readMap(); + Map streamInMap = in.readGenericMap(); assertEquals(streamOutMap, streamInMap); } } diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutputTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutputTests.java index 3077944490d5a..fd54dd12ce189 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutputTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutputTests.java @@ -788,7 +788,7 @@ public void testReadMapByUsingWriteMapWithConsistentOrder() throws IOException { try (RecyclerBytesStreamOutput streamOut = new RecyclerBytesStreamOutput(recycler)) { streamOut.writeMapWithConsistentOrder(streamOutMap); StreamInput in = StreamInput.wrap(BytesReference.toBytes(streamOut.bytes())); - Map streamInMap = in.readMap(); + Map streamInMap = in.readGenericMap(); assertEquals(streamOutMap, streamInMap); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java index 59fd1db1e72f2..0ea0cba8198c5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoResponse.java @@ -362,7 +362,7 @@ public FeatureSet(String name, boolean available, boolean enabled) { public FeatureSet(StreamInput in) throws IOException { this(in.readString(), readAvailable(in), in.readBoolean()); if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { - in.readMap(); // backcompat reading native code info, but no longer used here + in.readGenericMap(); // backcompat reading native code info, but no longer used here } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiFeatureSetUsage.java index 789a927dd6bf4..ac261270db6d6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/HealthApiFeatureSetUsage.java @@ -77,7 +77,7 @@ public class HealthApiFeatureSetUsage extends XPackFeatureSet.Usage { public HealthApiFeatureSetUsage(StreamInput in) throws IOException { super(in); - usageStats = in.readMap(); + usageStats = in.readGenericMap(); } public HealthApiFeatureSetUsage(boolean available, boolean enabled, @Nullable Counters stats) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/EnterpriseSearchFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/EnterpriseSearchFeatureSetUsage.java index e88d52e6d8080..dc5169648e0cd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/EnterpriseSearchFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/application/EnterpriseSearchFeatureSetUsage.java @@ -54,14 +54,14 @@ public EnterpriseSearchFeatureSetUsage( public EnterpriseSearchFeatureSetUsage(StreamInput in) throws IOException { super(in); - this.searchApplicationsUsage = in.readMap(); + this.searchApplicationsUsage = in.readGenericMap(); Map analyticsCollectionsUsage = new HashMap<>(); Map queryRulesUsage = new HashMap<>(); if (in.getTransportVersion().onOrAfter(QUERY_RULES_TRANSPORT_VERSION)) { - analyticsCollectionsUsage = in.readMap(); - queryRulesUsage = in.readMap(); + analyticsCollectionsUsage = in.readGenericMap(); + queryRulesUsage = in.readGenericMap(); } else if (in.getTransportVersion().onOrAfter(BEHAVIORAL_ANALYTICS_TRANSPORT_VERSION)) { - analyticsCollectionsUsage = in.readMap(); + analyticsCollectionsUsage = in.readGenericMap(); } this.analyticsCollectionsUsage = analyticsCollectionsUsage; this.queryRulesUsage = queryRulesUsage; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationIssue.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationIssue.java index 8e0a445db6278..2a888506598d7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationIssue.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/deprecation/DeprecationIssue.java @@ -98,7 +98,7 @@ public DeprecationIssue(StreamInput in) throws IOException { url = in.readString(); details = in.readOptionalString(); resolveDuringRollingUpgrade = in.readBoolean(); - meta = in.readMap(); + meta = in.readGenericMap(); } public Level getLevel() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/eql/EqlFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/eql/EqlFeatureSetUsage.java index 0f384ef2a66fa..6285840b66039 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/eql/EqlFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/eql/EqlFeatureSetUsage.java @@ -24,7 +24,7 @@ public class EqlFeatureSetUsage extends XPackFeatureSet.Usage { public EqlFeatureSetUsage(StreamInput in) throws IOException { super(in); - stats = in.readMap(); + stats = in.readGenericMap(); } public EqlFeatureSetUsage(Map stats) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlFeatureSetUsage.java index 4f68ff1db6033..c5c5ff708c0b7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/EsqlFeatureSetUsage.java @@ -24,7 +24,7 @@ public class EsqlFeatureSetUsage extends XPackFeatureSet.Usage { public EsqlFeatureSetUsage(StreamInput in) throws IOException { super(in); - stats = in.readMap(); + stats = in.readGenericMap(); } public EsqlFeatureSetUsage(Map stats) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java index 322f64405ca1f..b8bb0233b2c91 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecyclePolicy.java @@ -109,7 +109,7 @@ public LifecyclePolicy(StreamInput in) throws IOException { type = in.readNamedWriteable(LifecycleType.class); name = in.readString(); phases = in.readImmutableMap(Phase::new); - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); if (in.getTransportVersion().onOrAfter(TransportVersions.DEPRECATED_COMPONENT_TEMPLATES_ADDED)) { this.deprecated = in.readOptionalBoolean(); } else { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java index 53391aca84622..a1eabb682c98f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceAction.java @@ -83,7 +83,7 @@ public Request(StreamInput in) throws IOException { } else { this.input = List.of(in.readString()); } - this.taskSettings = in.readMap(); + this.taskSettings = in.readGenericMap(); } public TaskType getTaskType() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java index ef2e5324678a4..98c31dd9106d0 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MachineLearningFeatureSetUsage.java @@ -57,10 +57,10 @@ public MachineLearningFeatureSetUsage( public MachineLearningFeatureSetUsage(StreamInput in) throws IOException { super(in); - this.jobsUsage = in.readMap(); - this.datafeedsUsage = in.readMap(); - this.analyticsUsage = in.readMap(); - this.inferenceUsage = in.readMap(); + this.jobsUsage = in.readGenericMap(); + this.datafeedsUsage = in.readGenericMap(); + this.analyticsUsage = in.readGenericMap(); + this.inferenceUsage = in.readGenericMap(); this.nodeCount = in.readInt(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceAction.java index 8ff0c1179ea61..03270e0dda0f7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceAction.java @@ -125,8 +125,8 @@ public Request(StreamInput in) throws IOException { this.modelId = in.readString(); this.requestModelType = in.readEnum(RequestModelType.class); this.inputs = in.readOptionalStringCollectionAsList(); - this.taskSettings = in.readMap(); - this.objectsToInfer = in.readOptionalCollectionAsList(StreamInput::readMap); + this.taskSettings = in.readGenericMap(); + this.objectsToInfer = in.readOptionalCollectionAsList(StreamInput::readGenericMap); this.inferenceConfigUpdate = in.readOptionalNamedWriteable(InferenceConfigUpdate.class); this.previouslyLicensed = in.readOptionalBoolean(); this.inferenceTimeout = in.readOptionalTimeValue(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java index 296aec12b1a63..d38897ad3e5e7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java @@ -176,7 +176,7 @@ public static Request forTextInput( public Request(StreamInput in) throws IOException { super(in); this.id = in.readString(); - this.objectsToInfer = in.readCollectionAsImmutableList(StreamInput::readMap); + this.objectsToInfer = in.readCollectionAsImmutableList(StreamInput::readGenericMap); this.update = in.readNamedWriteable(InferenceConfigUpdate.class); this.previouslyLicensed = in.readBoolean(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java index 806f935d5f394..99d190a786564 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferTrainedModelDeploymentAction.java @@ -147,7 +147,7 @@ public static Request forTextInput(String id, InferenceConfigUpdate update, List public Request(StreamInput in) throws IOException { super(in); id = in.readString(); - docs = in.readCollectionAsImmutableList(StreamInput::readMap); + docs = in.readCollectionAsImmutableList(StreamInput::readGenericMap); update = in.readOptionalNamedWriteable(InferenceConfigUpdate.class); inferenceTimeout = in.readOptionalTimeValue(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_3_0)) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java index b5cb34812601e..3c69056625e89 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java @@ -59,7 +59,7 @@ public Response() { public Response(StreamInput in) throws IOException { super(in); - info = in.readMap(); + info = in.readGenericMap(); } public Map getInfo() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java index 97cbc29b3cf44..86c794084388f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java @@ -143,7 +143,7 @@ public Response(List> featureValues) { public Response(StreamInput in) throws IOException { super(in); - this.featureValues = in.readCollectionAsList(StreamInput::readMap); + this.featureValues = in.readCollectionAsList(StreamInput::readGenericMap); } public List> getFeatureValues() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java index d994647743634..aa7e21fcd1aed 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/AggProvider.java @@ -114,7 +114,7 @@ static AggProvider fromParsedAggs(AggregatorFactories.Builder parsedAggs) throws static AggProvider fromStream(StreamInput in) throws IOException { return new AggProvider( - in.readMap(), + in.readGenericMap(), in.readOptionalWriteable(AggregatorFactories.Builder::new), in.readException(), in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0) ? in.readBoolean() : false diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java index db1b66982f105..f818199ac1ef9 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfig.java @@ -300,7 +300,7 @@ public DatafeedConfig(StreamInput in) throws IOException { delayedDataCheckConfig = in.readOptionalWriteable(DelayedDataCheckConfig::new); maxEmptySearches = in.readOptionalVInt(); indicesOptions = IndicesOptions.readIndicesOptions(in); - runtimeMappings = in.readMap(); + runtimeMappings = in.readGenericMap(); } /** @@ -815,7 +815,7 @@ public Builder(StreamInput in) throws IOException { if (in.readBoolean()) { indicesOptions = IndicesOptions.readIndicesOptions(in); } - runtimeMappings = in.readMap(); + runtimeMappings = in.readGenericMap(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java index 6b34277ac49ba..35eb672fe69cb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedUpdate.java @@ -166,7 +166,7 @@ public DatafeedUpdate(StreamInput in) throws IOException { delayedDataCheckConfig = in.readOptionalWriteable(DelayedDataCheckConfig::new); maxEmptySearches = in.readOptionalInt(); indicesOptions = in.readBoolean() ? IndicesOptions.readIndicesOptions(in) : null; - this.runtimeMappings = in.readBoolean() ? in.readMap() : null; + this.runtimeMappings = in.readBoolean() ? in.readGenericMap() : null; } /** diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java index bff15c016af0e..4c9028f64c2fd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfig.java @@ -192,7 +192,7 @@ public DataFrameAnalyticsConfig(StreamInput in) throws IOException { this.allowLazyStart = in.readBoolean(); this.maxNumThreads = in.readVInt(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - Map readMeta = in.readMap(); + Map readMeta = in.readGenericMap(); this.meta = readMeta == null ? null : Collections.unmodifiableMap(readMeta); } else { this.meta = null; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigUpdate.java index 330683981d1ca..403e4f6de0e36 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsConfigUpdate.java @@ -84,7 +84,7 @@ public DataFrameAnalyticsConfigUpdate(StreamInput in) throws IOException { this.allowLazyStart = in.readOptionalBoolean(); this.maxNumThreads = in.readOptionalVInt(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - Map readMeta = in.readMap(); + Map readMeta = in.readGenericMap(); this.meta = readMeta == null ? null : Collections.unmodifiableMap(readMeta); } else { this.meta = null; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java index 9c326f067caf7..b7564ff5ecbf5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java @@ -107,7 +107,7 @@ public DataFrameAnalyticsSource(StreamInput in) throws IOException { index = in.readStringArray(); queryProvider = QueryProvider.fromStream(in); sourceFiltering = in.readOptionalWriteable(FetchSourceContext::readFrom); - runtimeMappings = in.readMap(); + runtimeMappings = in.readGenericMap(); } public DataFrameAnalyticsSource(DataFrameAnalyticsSource other) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java index b469d35b90383..c80027a7234f3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfig.java @@ -271,7 +271,7 @@ public TrainedModelConfig(StreamInput in) throws IOException { createTime = in.readInstant(); definition = in.readOptionalWriteable(LazyModelDefinition::fromStreamInput); tags = in.readCollectionAsImmutableList(StreamInput::readString); - metadata = in.readMap(); + metadata = in.readGenericMap(); input = new TrainedModelInput(in); modelSize = in.readVLong(); estimatedOperations = in.readVLong(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/LearningToRankConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/LearningToRankConfig.java index 7a51fb9a0fce3..293769371999e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/LearningToRankConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/LearningToRankConfig.java @@ -98,7 +98,7 @@ public LearningToRankConfig( public LearningToRankConfig(StreamInput in) throws IOException { super(in); this.featureExtractorBuilders = in.readNamedWriteableCollectionAsList(LearningToRankFeatureExtractorBuilder.class); - this.paramsDefaults = in.readMap(); + this.paramsDefaults = in.readGenericMap(); } public List getFeatureExtractorBuilders() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java index 536cce95df527..14bb5499ac4ab 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ModelPackageConfig.java @@ -173,8 +173,8 @@ public ModelPackageConfig(StreamInput in) throws IOException { this.createTime = in.readOptionalInstant(); this.size = in.readVLong(); this.sha256 = in.readOptionalString(); - this.inferenceConfigSource = in.readMap(); - this.metadata = in.readMap(); + this.inferenceConfigSource = in.readGenericMap(); + this.metadata = in.readGenericMap(); this.modelType = in.readOptionalString(); this.tags = in.readOptionalCollectionAsList(StreamInput::readString); this.vocabularyFile = in.readOptionalString(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java index 081ddb6a395a8..1686cdea4340a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java @@ -291,7 +291,7 @@ public Job(StreamInput in) throws IOException { modelSnapshotRetentionDays = in.readOptionalLong(); dailyModelSnapshotRetentionAfterDays = in.readOptionalLong(); resultsRetentionDays = in.readOptionalLong(); - Map readCustomSettings = in.readMap(); + Map readCustomSettings = in.readGenericMap(); customSettings = readCustomSettings == null ? null : Collections.unmodifiableMap(readCustomSettings); modelSnapshotId = in.readOptionalString(); if (in.readBoolean()) { @@ -843,7 +843,7 @@ public Builder(StreamInput in) throws IOException { modelSnapshotRetentionDays = in.readOptionalLong(); dailyModelSnapshotRetentionAfterDays = in.readOptionalLong(); resultsRetentionDays = in.readOptionalLong(); - customSettings = in.readMap(); + customSettings = in.readGenericMap(); modelSnapshotId = in.readOptionalString(); if (in.readBoolean()) { modelSnapshotMinVersion = MlConfigVersion.readVersion(in); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java index 6dcdad2dc0a8d..3ba40c70d0701 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/JobUpdate.java @@ -178,7 +178,7 @@ public JobUpdate(StreamInput in) throws IOException { categorizationFilters = null; } perPartitionCategorizationConfig = in.readOptionalWriteable(PerPartitionCategorizationConfig::new); - customSettings = in.readMap(); + customSettings = in.readGenericMap(); modelSnapshotId = in.readOptionalString(); if (in.readBoolean()) { jobVersion = MlConfigVersion.readVersion(in); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/QueryProvider.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/QueryProvider.java index 5b22165b57443..007b748a71d80 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/QueryProvider.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/QueryProvider.java @@ -73,7 +73,7 @@ public static QueryProvider fromParsedQuery(QueryBuilder parsedQuery) throws IOE } public static QueryProvider fromStream(StreamInput in) throws IOException { - return new QueryProvider(in.readMap(), in.readOptionalNamedWriteable(QueryBuilder.class), in.readException()); + return new QueryProvider(in.readGenericMap(), in.readOptionalNamedWriteable(QueryBuilder.class), in.readException()); } QueryProvider(Map query, QueryBuilder parsedQuery, Exception parsingException) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java index 546c139766248..4c0f347a3ffed 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/MonitoringFeatureSetUsage.java @@ -28,7 +28,7 @@ public class MonitoringFeatureSetUsage extends XPackFeatureSet.Usage { public MonitoringFeatureSetUsage(StreamInput in) throws IOException { super(in); - exporters = in.readMap(); + exporters = in.readGenericMap(); collectionEnabled = in.readOptionalBoolean(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/RollupJobCaps.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/RollupJobCaps.java index 040f7e1637a50..292531499e619 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/RollupJobCaps.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/RollupJobCaps.java @@ -211,7 +211,7 @@ public static class RollupFieldCaps implements Writeable, ToXContentFragment { int size = in.readInt(); List> inAggs = new ArrayList<>(size); for (int i = 0; i < size; i++) { - inAggs.add(in.readMap()); + inAggs.add(in.readGenericMap()); } this.aggs = Collections.unmodifiableList(inAggs); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java index 19c718073d702..1ba625a507a46 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java @@ -74,7 +74,7 @@ public RollupJobStatus(IndexerState state, @Nullable Map positio public RollupJobStatus(StreamInput in) throws IOException { state = IndexerState.fromStream(in); - currentPosition = in.readBoolean() ? new TreeMap<>(in.readMap()) : null; + currentPosition = in.readBoolean() ? new TreeMap<>(in.readGenericMap()) : null; if (in.getTransportVersion().before(TransportVersions.V_8_0_0)) { // 7.x nodes serialize `upgradedDocumentID` flag. We don't need it anymore, but // we need to pull it off the stream diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java index ca0ba9b8196bc..c88e13f80ba01 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityFeatureSetUsage.java @@ -52,31 +52,31 @@ public class SecurityFeatureSetUsage extends XPackFeatureSet.Usage { public SecurityFeatureSetUsage(StreamInput in) throws IOException { super(in); - realmsUsage = in.readMap(); - rolesStoreUsage = in.readMap(); - sslUsage = in.readMap(); + realmsUsage = in.readGenericMap(); + rolesStoreUsage = in.readGenericMap(); + sslUsage = in.readGenericMap(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_2_0)) { - tokenServiceUsage = in.readMap(); - apiKeyServiceUsage = in.readMap(); + tokenServiceUsage = in.readGenericMap(); + apiKeyServiceUsage = in.readGenericMap(); } - auditUsage = in.readMap(); - ipFilterUsage = in.readMap(); - anonymousUsage = in.readMap(); - roleMappingStoreUsage = in.readMap(); + auditUsage = in.readGenericMap(); + ipFilterUsage = in.readGenericMap(); + anonymousUsage = in.readGenericMap(); + roleMappingStoreUsage = in.readGenericMap(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_5_0)) { - fips140Usage = in.readMap(); + fips140Usage = in.readGenericMap(); } if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_11_0)) { - operatorPrivilegesUsage = in.readMap(); + operatorPrivilegesUsage = in.readGenericMap(); } if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_2_0)) { - domainsUsage = in.readMap(); + domainsUsage = in.readGenericMap(); } if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_5_0)) { - userProfileUsage = in.readMap(); + userProfileUsage = in.readGenericMap(); } if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { - remoteClusterServerUsage = in.readMap(); + remoteClusterServerUsage = in.readGenericMap(); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/ApiKey.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/ApiKey.java index b06b7728f541f..e57570ce7385b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/ApiKey.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/ApiKey.java @@ -191,7 +191,7 @@ public ApiKey(StreamInput in) throws IOException { this.username = in.readString(); this.realm = in.readString(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); } else { this.metadata = Map.of(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/BaseUpdateApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/BaseUpdateApiKeyRequest.java index a1acb6c9581f5..3813e8cb496d6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/BaseUpdateApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/BaseUpdateApiKeyRequest.java @@ -46,7 +46,7 @@ public BaseUpdateApiKeyRequest( public BaseUpdateApiKeyRequest(StreamInput in) throws IOException { super(in); this.roleDescriptors = in.readOptionalCollectionAsList(RoleDescriptor::new); - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); if (in.getTransportVersion().onOrAfter(TransportVersions.UPDATE_API_KEY_EXPIRATION_TIME_ADDED)) { expiration = in.readOptionalTimeValue(); } else { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/CreateApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/CreateApiKeyRequest.java index e49ba19631a7e..32669d5dca447 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/CreateApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/CreateApiKeyRequest.java @@ -66,7 +66,7 @@ public CreateApiKeyRequest(StreamInput in) throws IOException { this.roleDescriptors = in.readCollectionAsImmutableList(RoleDescriptor::new); this.refreshPolicy = WriteRequest.RefreshPolicy.readFrom(in); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_0_0)) { - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); } else { this.metadata = null; } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/CreateCrossClusterApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/CreateCrossClusterApiKeyRequest.java index 46e19d8af6f74..a375808def6d7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/CreateCrossClusterApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/CreateCrossClusterApiKeyRequest.java @@ -43,7 +43,7 @@ public CreateCrossClusterApiKeyRequest(StreamInput in) throws IOException { this.expiration = in.readOptionalTimeValue(); this.roleDescriptors = in.readCollectionAsImmutableList(RoleDescriptor::new); this.refreshPolicy = WriteRequest.RefreshPolicy.readFrom(in); - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/Profile.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/Profile.java index 1ce0540946edd..26c4d9b324027 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/Profile.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/Profile.java @@ -108,7 +108,15 @@ public void writeTo(StreamOutput out) throws IOException { } public Profile(StreamInput in) throws IOException { - this(in.readString(), in.readBoolean(), in.readLong(), new ProfileUser(in), in.readMap(), in.readMap(), new VersionControl(in)); + this( + in.readString(), + in.readBoolean(), + in.readLong(), + new ProfileUser(in), + in.readGenericMap(), + in.readGenericMap(), + new VersionControl(in) + ); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/UpdateProfileDataRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/UpdateProfileDataRequest.java index cd93a3c7e5cc1..90d59e0e39f48 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/UpdateProfileDataRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/UpdateProfileDataRequest.java @@ -50,8 +50,8 @@ public UpdateProfileDataRequest( public UpdateProfileDataRequest(StreamInput in) throws IOException { super(in); this.uid = in.readString(); - this.labels = in.readMap(); - this.data = in.readMap(); + this.labels = in.readGenericMap(); + this.data = in.readGenericMap(); this.ifPrimaryTerm = in.readLong(); this.ifSeqNo = in.readLong(); this.refreshPolicy = RefreshPolicy.readFrom(in); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java index e82a77f311de6..bb7fe59dce5e6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java @@ -58,7 +58,7 @@ public PutRoleRequest(StreamInput in) throws IOException { configurableClusterPrivileges = ConfigurableClusterPrivileges.readArray(in); runAs = in.readStringArray(); refreshPolicy = RefreshPolicy.readFrom(in); - metadata = in.readMap(); + metadata = in.readGenericMap(); if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { remoteIndicesPrivileges = in.readCollectionAsList(RoleDescriptor.RemoteIndicesPrivileges::new); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/PutRoleMappingRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/PutRoleMappingRequest.java index 8059a30b88952..039ed8aa5fb64 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/PutRoleMappingRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/PutRoleMappingRequest.java @@ -51,7 +51,7 @@ public PutRoleMappingRequest(StreamInput in) throws IOException { this.roleTemplates = in.readCollectionAsList(TemplateRoleName::new); } this.rules = ExpressionParser.readExpression(in); - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); this.refreshPolicy = RefreshPolicy.readFrom(in); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/settings/UpdateSecuritySettingsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/settings/UpdateSecuritySettingsAction.java index a2342f43595e2..88bc63a3a78f8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/settings/UpdateSecuritySettingsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/settings/UpdateSecuritySettingsAction.java @@ -78,9 +78,9 @@ public Request( } public Request(StreamInput in) throws IOException { - this.mainIndexSettings = in.readMap(); - this.tokensIndexSettings = in.readMap(); - this.profilesIndexSettings = in.readMap(); + this.mainIndexSettings = in.readGenericMap(); + this.tokensIndexSettings = in.readGenericMap(); + this.profilesIndexSettings = in.readGenericMap(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequest.java index 37f9d85a29573..a188c664f66de 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequest.java @@ -44,7 +44,7 @@ public PutUserRequest(StreamInput in) throws IOException { roles = in.readStringArray(); fullName = in.readOptionalString(); email = in.readOptionalString(); - metadata = in.readBoolean() ? in.readMap() : null; + metadata = in.readBoolean() ? in.readGenericMap() : null; refreshPolicy = RefreshPolicy.readFrom(in); enabled = in.readBoolean(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java index 4d285cf3b144d..d71690f3dc8e7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java @@ -757,7 +757,7 @@ private static Map readMetadata(StreamInput in) throws IOExcepti } return metadata; } else { - return in.readMap(); + return in.readGenericMap(); } } @@ -1467,7 +1467,7 @@ private static User readUserWithoutTrailingBoolean(StreamInput input) throws IOE return InternalUsers.getUser(username); } String[] roles = input.readStringArray(); - Map metadata = input.readMap(); + Map metadata = input.readGenericMap(); String fullName = input.readOptionalString(); String email = input.readOptionalString(); boolean enabled = input.readBoolean(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/ExpressionRoleMapping.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/ExpressionRoleMapping.java index 4c307109bfeb5..f0976a058738a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/ExpressionRoleMapping.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/mapper/ExpressionRoleMapping.java @@ -102,7 +102,7 @@ public ExpressionRoleMapping(StreamInput in) throws IOException { this.roleTemplates = Collections.emptyList(); } this.expression = ExpressionParser.readExpression(in); - this.metadata = in.readMap(); + this.metadata = in.readGenericMap(); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java index 9151f61f0a946..f39eca877432c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptor.java @@ -188,8 +188,8 @@ public RoleDescriptor(StreamInput in) throws IOException { indicesPrivileges[i] = new IndicesPrivileges(in); } this.runAs = in.readStringArray(); - this.metadata = in.readMap(); - this.transientMetadata = in.readMap(); + this.metadata = in.readGenericMap(); + this.transientMetadata = in.readGenericMap(); this.applicationPrivileges = in.readArray(ApplicationResourcePrivileges::new, ApplicationResourcePrivileges[]::new); this.configurableClusterPrivileges = ConfigurableClusterPrivileges.readArray(in); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ApplicationPrivilegeDescriptor.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ApplicationPrivilegeDescriptor.java index 1cf59710d2476..bd302fd4ac217 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ApplicationPrivilegeDescriptor.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege/ApplicationPrivilegeDescriptor.java @@ -66,7 +66,7 @@ public ApplicationPrivilegeDescriptor(StreamInput input) throws IOException { this.application = input.readString(); this.name = input.readString(); this.actions = input.readCollectionAsImmutableSet(StreamInput::readString); - this.metadata = Collections.unmodifiableMap(input.readMap()); + this.metadata = Collections.unmodifiableMap(input.readGenericMap()); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecyclePolicy.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecyclePolicy.java index 357be8768fd07..4dc0ea1d77e42 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecyclePolicy.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecyclePolicy.java @@ -99,7 +99,7 @@ public SnapshotLifecyclePolicy(StreamInput in) throws IOException { this.name = in.readString(); this.schedule = in.readString(); this.repository = in.readString(); - this.configuration = in.readMap(); + this.configuration = in.readGenericMap(); this.retentionPolicy = in.readOptionalWriteable(SnapshotRetentionConfiguration::new); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/sql/SqlFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/sql/SqlFeatureSetUsage.java index fbb8025d0e446..a431dab0b34d5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/sql/SqlFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/sql/SqlFeatureSetUsage.java @@ -24,7 +24,7 @@ public class SqlFeatureSetUsage extends XPackFeatureSet.Usage { public SqlFeatureSetUsage(StreamInput in) throws IOException { super(in); - stats = in.readMap(); + stats = in.readGenericMap(); } public SqlFeatureSetUsage(Map stats) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/FieldStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/FieldStats.java index 815723e40a373..90e59b525e423 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/FieldStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/FieldStats.java @@ -123,7 +123,7 @@ public FieldStats(StreamInput in) throws IOException { medianValue = in.readOptionalDouble(); earliestTimestamp = in.readOptionalString(); latestTimestamp = in.readOptionalString(); - topHits = in.readCollectionAsList(StreamInput::readMap); + topHits = in.readCollectionAsList(StreamInput::readGenericMap); } @Override diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/TextStructure.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/TextStructure.java index b39fc27b7a148..6c49d94a4ee90 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/TextStructure.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/structurefinder/TextStructure.java @@ -235,8 +235,8 @@ public TextStructure(StreamInput in) throws IOException { javaTimestampFormats = in.readBoolean() ? in.readCollectionAsImmutableList(StreamInput::readString) : null; timestampField = in.readOptionalString(); needClientTimezone = in.readBoolean(); - mappings = Collections.unmodifiableSortedMap(new TreeMap<>(in.readMap())); - ingestPipeline = in.readBoolean() ? Collections.unmodifiableMap(in.readMap()) : null; + mappings = Collections.unmodifiableSortedMap(new TreeMap<>(in.readGenericMap())); + ingestPipeline = in.readBoolean() ? Collections.unmodifiableMap(in.readGenericMap()) : null; fieldStats = Collections.unmodifiableSortedMap(new TreeMap<>(in.readMap(FieldStats::new))); explanation = in.readCollectionAsImmutableList(StreamInput::readString); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PreviewTransformAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PreviewTransformAction.java index 2109ab596ef84..98018589e73a4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PreviewTransformAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/PreviewTransformAction.java @@ -183,7 +183,7 @@ public Response(StreamInput in) throws IOException { int size = in.readInt(); this.docs = new ArrayList<>(size); for (int i = 0; i < size; i++) { - this.docs.add(in.readMap()); + this.docs.add(in.readGenericMap()); } this.generatedDestIndexSettings = new TransformDestIndexSettings(in); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfig.java index 2881f5021cb80..451ec7ce8aadc 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/QueryConfig.java @@ -61,7 +61,7 @@ public QueryConfig(final Map source, final QueryBuilder query) { } public QueryConfig(final StreamInput in) throws IOException { - this.source = in.readMap(); + this.source = in.readGenericMap(); this.query = in.readOptionalNamedWriteable(QueryBuilder.class); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java index 0957d70e9ab5c..476c34c1f5592 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java @@ -111,7 +111,7 @@ private static String[] extractIndices(String[] index) { public SourceConfig(final StreamInput in) throws IOException { index = in.readStringArray(); queryConfig = new QueryConfig(in); - runtimeMappings = in.readMap(); + runtimeMappings = in.readGenericMap(); } public String[] getIndex() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformCheckpoint.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformCheckpoint.java index b122e96339e9e..fea6299c73e62 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformCheckpoint.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformCheckpoint.java @@ -128,7 +128,7 @@ public TransformCheckpoint(StreamInput in) throws IOException { this.transformId = in.readString(); this.timestampMillis = in.readLong(); this.checkpoint = in.readLong(); - this.indicesCheckpoints = readCheckpoints(in.readMap()); + this.indicesCheckpoints = readCheckpoints(in.readGenericMap()); this.timeUpperBoundMillis = in.readLong(); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java index 9658cdd74e196..d89eb9b397180 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java @@ -257,7 +257,7 @@ public TransformConfig(final StreamInput in) throws IOException { createTime = in.readOptionalInstant(); transformVersion = in.readBoolean() ? TransformConfigVersion.readVersion(in) : null; settings = new SettingsConfig(in); - metadata = in.readMap(); + metadata = in.readGenericMap(); retentionPolicyConfig = in.readOptionalNamedWriteable(RetentionPolicyConfig.class); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java index 05e43a11ba841..502d403cf979f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java @@ -117,7 +117,7 @@ public TransformConfigUpdate(final StreamInput in) throws IOException { setHeaders(in.readMap(StreamInput::readString)); } settings = in.readOptionalWriteable(SettingsConfig::new); - metadata = in.readMap(); + metadata = in.readGenericMap(); retentionPolicyConfig = in.readOptionalNamedWriteable(RetentionPolicyConfig.class); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformDestIndexSettings.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformDestIndexSettings.java index e202ab37bdc02..16ca196253f26 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformDestIndexSettings.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformDestIndexSettings.java @@ -75,7 +75,7 @@ public TransformDestIndexSettings(Map mappings, Settings setting } public TransformDestIndexSettings(StreamInput in) throws IOException { - mappings = in.readMap(); + mappings = in.readGenericMap(); settings = Settings.readSettingsFromStream(in); aliases = new HashSet<>(in.readCollectionAsList(Alias::new)); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerPosition.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerPosition.java index 2933abf554219..76174aae8e958 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerPosition.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerPosition.java @@ -52,9 +52,9 @@ public TransformIndexerPosition(Map indexerPosition, Map position = in.readMap(); + Map position = in.readGenericMap(); indexerPosition = position == null ? null : Collections.unmodifiableMap(position); - position = in.readMap(); + position = in.readGenericMap(); bucketPosition = position == null ? null : Collections.unmodifiableMap(position); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java index 2508b5e1bf01b..b2f7ac28210e2 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformState.java @@ -134,7 +134,7 @@ public TransformState(StreamInput in) throws IOException { if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_3_0)) { position = in.readOptionalWriteable(TransformIndexerPosition::new); } else { - Map pos = in.readMap(); + Map pos = in.readGenericMap(); position = new TransformIndexerPosition(pos, null); } checkpoint = in.readLong(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfig.java index df5070434c915..6bf3686315762 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/AggregationConfig.java @@ -63,7 +63,7 @@ public AggregationConfig(final Map source, AggregatorFactories.B } public AggregationConfig(final StreamInput in) throws IOException { - source = in.readMap(); + source = in.readGenericMap(); aggregations = in.readOptionalWriteable(AggregatorFactories.Builder::new); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfig.java index 1f17dd21376a5..c70b5b73b0256 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/GroupConfig.java @@ -58,7 +58,7 @@ public GroupConfig(final Map source, final Map { SingleGroupSource.Type groupType = SingleGroupSource.Type.fromId(stream.readByte()); return switch (groupType) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/ScriptConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/ScriptConfig.java index e63fcc73db66e..f8bc06b61f521 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/ScriptConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/pivot/ScriptConfig.java @@ -45,7 +45,7 @@ public ScriptConfig(final Map source, Script script) { } public ScriptConfig(final StreamInput in) throws IOException { - source = in.readMap(); + source = in.readGenericMap(); script = in.readOptionalWriteable(Script::new); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/WatcherFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/WatcherFeatureSetUsage.java index 18ffeeb9a3206..fce9399a9bf01 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/WatcherFeatureSetUsage.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/WatcherFeatureSetUsage.java @@ -23,7 +23,7 @@ public class WatcherFeatureSetUsage extends XPackFeatureSet.Usage { public WatcherFeatureSetUsage(StreamInput in) throws IOException { super(in); - stats = in.readMap(); + stats = in.readGenericMap(); } public WatcherFeatureSetUsage(boolean available, boolean enabled, Map stats) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/execute/ExecuteWatchRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/execute/ExecuteWatchRequest.java index f311ab51b54e8..681b004dd1d28 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/execute/ExecuteWatchRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/execute/ExecuteWatchRequest.java @@ -60,10 +60,10 @@ public ExecuteWatchRequest(StreamInput in) throws IOException { ignoreCondition = in.readBoolean(); recordExecution = in.readBoolean(); if (in.readBoolean()) { - alternativeInput = in.readMap(); + alternativeInput = in.readGenericMap(); } if (in.readBoolean()) { - triggerData = in.readMap(); + triggerData = in.readGenericMap(); } long actionModesCount = in.readLong(); actionModes = new HashMap<>(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/UpdateWatcherSettingsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/UpdateWatcherSettingsAction.java index c4e1f365ac2c1..f8d0ade06e022 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/UpdateWatcherSettingsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/put/UpdateWatcherSettingsAction.java @@ -43,7 +43,7 @@ public Request(Map settings) { } public Request(StreamInput in) throws IOException { - this.settings = in.readMap(); + this.settings = in.readGenericMap(); } @Override diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java index 9cca42b0402bf..b9093a2597d7d 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/QueryRule.java @@ -108,7 +108,7 @@ public QueryRule(StreamInput in) throws IOException { this.id = in.readString(); this.type = QueryRuleType.queryRuleType(in.readString()); this.criteria = in.readCollectionAsList(QueryRuleCriteria::new); - this.actions = in.readMap(); + this.actions = in.readGenericMap(); validate(); } diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java index 78cde38ec8c4d..b23ed92a5d9b8 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/RuleQueryBuilder.java @@ -83,7 +83,7 @@ public RuleQueryBuilder(QueryBuilder organicQuery, Map matchCrit public RuleQueryBuilder(StreamInput in) throws IOException { super(in); organicQuery = in.readNamedWriteable(QueryBuilder.class); - matchCriteria = in.readMap(); + matchCriteria = in.readGenericMap(); rulesetId = in.readString(); pinnedIds = in.readOptionalStringCollectionAsList(); pinnedIdsSupplier = null; diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/SearchApplicationSearchRequest.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/SearchApplicationSearchRequest.java index b741221890429..105b58308217b 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/SearchApplicationSearchRequest.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/SearchApplicationSearchRequest.java @@ -42,7 +42,7 @@ public class SearchApplicationSearchRequest extends ActionRequest implements Ind public SearchApplicationSearchRequest(StreamInput in) throws IOException { super(in); this.name = in.readString(); - this.queryParams = in.readMap(); + this.queryParams = in.readGenericMap(); } public SearchApplicationSearchRequest(String name) { diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java index 5811d328ae7dd..0aeddd525e317 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java @@ -128,7 +128,7 @@ public EqlSearchRequest(StreamInput in) throws IOException { if (in.readBoolean()) { fetchFields = in.readCollectionAsList(FieldAndFormat::new); } - runtimeMappings = in.readMap(); + runtimeMappings = in.readGenericMap(); } else { runtimeMappings = emptyMap(); } diff --git a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/execution/sample/CircuitBreakerTests.java b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/execution/sample/CircuitBreakerTests.java index 8c47bfeb8921d..9141555fcd613 100644 --- a/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/execution/sample/CircuitBreakerTests.java +++ b/x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/execution/sample/CircuitBreakerTests.java @@ -293,7 +293,7 @@ public List readStringCollectionAsList() throws IOException { } @Override - public Map readMap() throws IOException { + public Map readGenericMap() throws IOException { return emptyMap(); } }); diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlValidateAuthnRequestResponse.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlValidateAuthnRequestResponse.java index 4a26a37c800f0..e2b32c7e7023c 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlValidateAuthnRequestResponse.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlValidateAuthnRequestResponse.java @@ -26,7 +26,7 @@ public SamlValidateAuthnRequestResponse(StreamInput in) throws IOException { this.spEntityId = in.readString(); this.assertionConsumerService = in.readString(); this.forceAuthn = in.readBoolean(); - this.authnState = in.readMap(); + this.authnState = in.readGenericMap(); } public SamlValidateAuthnRequestResponse(String spEntityId, String acs, boolean forceAuthn, Map authnState) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearningToRankRescorerBuilder.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearningToRankRescorerBuilder.java index 038f3fb08adbf..11676cc4a1599 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearningToRankRescorerBuilder.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/ltr/LearningToRankRescorerBuilder.java @@ -89,7 +89,7 @@ public static LearningToRankRescorerBuilder fromXContent(XContentParser parser, public LearningToRankRescorerBuilder(StreamInput input, LearningToRankService learningToRankService) throws IOException { super(input); this.modelId = input.readString(); - this.params = input.readMap(); + this.params = input.readGenericMap(); this.learningToRankConfig = (LearningToRankConfig) input.readOptionalNamedWriteable(InferenceConfig.class); this.learningToRankService = learningToRankService; diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/UserToken.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/UserToken.java index 324150c2a35b1..4806fe348282e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/UserToken.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/UserToken.java @@ -74,7 +74,7 @@ private UserToken(TransportVersion version, Authentication authentication, Insta this.id = input.readString(); this.authentication = new Authentication(input); this.expirationTime = Instant.ofEpochSecond(input.readLong(), input.readInt()); - this.metadata = input.readMap(); + this.metadata = input.readGenericMap(); } @Override diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/history/SnapshotHistoryItem.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/history/SnapshotHistoryItem.java index 93c20840bba6e..60fdba2051041 100644 --- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/history/SnapshotHistoryItem.java +++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/history/SnapshotHistoryItem.java @@ -168,7 +168,7 @@ public SnapshotHistoryItem(StreamInput in) throws IOException { this.snapshotName = in.readString(); this.operation = in.readString(); this.success = in.readBoolean(); - this.snapshotConfiguration = in.readMap(); + this.snapshotConfiguration = in.readGenericMap(); this.errorDetails = in.readOptionalString(); } diff --git a/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java b/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java index 0f92b8905ef69..d711538ad1d09 100644 --- a/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java +++ b/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java @@ -438,7 +438,7 @@ public AbstractSqlQueryRequest(StreamInput in) throws IOException { pageTimeout = in.readTimeValue(); filter = in.readOptionalNamedWriteable(QueryBuilder.class); if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_13_0)) { - runtimeMappings = in.readMap(); + runtimeMappings = in.readGenericMap(); } } diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/PivotCursor.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/PivotCursor.java index 2deb79151c0b8..b400aa2a8d6ec 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/PivotCursor.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/execution/search/PivotCursor.java @@ -44,7 +44,7 @@ public class PivotCursor extends CompositeAggCursor { public PivotCursor(StreamInput in) throws IOException { super(in); - previousKey = in.readBoolean() ? in.readMap() : null; + previousKey = in.readBoolean() ? in.readGenericMap() : null; } @Override