From c0720e02002a1c09aa890b19c809310151c05d77 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 26 Jul 2022 18:00:23 +0100 Subject: [PATCH] Remove inheritance for code-generated types (#6611) * Remove inheritence for code gen of classes * Seal request types * Update serialization after inheritance removal * Prevent parallel tests which seem to hang * Fix search API test assertion * Fix multi search test * Rename and move some files * Queries derive from Query type * Update tests * Update test file --- .../Api/BulkRequest.cs | 2 +- .../Api/CountRequest.cs | 2 +- .../Common/Aggregations/Aggregate.cs | 16 + .../Common/Aggregations/Aggregation.cs | 27 + .../Common/Aggregations/AggregationBase.cs | 34 - .../Aggregations/AggregationCombinator.cs | 11 +- .../Aggregations/AggregationDictionary.cs | 6 +- .../Common/Query/{QueryBase.cs => Query.cs} | 26 +- ...AggregationContainerSerializationHelper.cs | 4 +- .../FieldNameQueryConverterBase.cs | 61 -- .../Serialization/IsADictionaryConverter.cs | 4 + .../Serialization/SourceSerialisation.cs | 8 +- .../TermsAggregateSerializationHelper.cs | 2 +- .../Serialization/UnionConverter.cs | 31 +- .../Types/Aggregations/AggregateDictionary.cs | 60 +- .../AggregateDictionaryConverter.cs | 4 +- .../Aggregations/AggregationContainer.cs | 4 +- .../Types/Aggregations/EmptyTermsAggregate.cs | 20 +- .../Types/Aggregations/EmptyTermsBucket.cs | 2 +- .../Aggregations/MultiBucketAggregateBase.cs | 16 - .../Types/Aggregations/TermsAggregate.cs | 20 +- .../Types/Aggregations/TermsBucket.cs | 16 +- .../Types/AsyncSearch/AsyncSearch.cs | 9 + .../Types/Bulk/BulkUpdateBody.cs | 2 +- .../Types/Bulk/BulkUpdateOperation.cs | 12 +- .../Bulk/BulkUpdateOperationDescriptor.cs | 4 +- .../Bulk/BulkUpdateOperationWithScript.cs | 10 +- .../Types/Bulk/ScriptedBulkUpdateBody.cs | 2 +- .../MultiSearch/MultiSearchRequest.cs | 12 - .../Types/MultiSearchItem.cs | 21 + .../Types/ScriptBase.cs | 103 +-- .../Types/Scripting/InlineScript.cs | 16 +- .../Types/Scripting/InlineScriptDescriptor.cs | 19 - .../Types/Scripting/Script.cs | 73 ++ .../Types/Scripting/ScriptDescriptor.cs | 53 -- .../AsyncSearch/AsyncSearchStatusRequest.g.cs | 2 +- .../AsyncSearch/AsyncSearchSubmitRequest.g.cs | 2 +- .../AsyncSearch/DeleteAsyncSearchRequest.g.cs | 2 +- .../AsyncSearch/GetAsyncSearchRequest.g.cs | 2 +- ...scalingDeleteAutoscalingPolicyRequest.g.cs | 2 +- ...oscalingGetAutoscalingCapacityRequest.g.cs | 2 +- ...utoscalingGetAutoscalingPolicyRequest.g.cs | 2 +- ...utoscalingPutAutoscalingPolicyRequest.g.cs | 2 +- .../_Generated/Api/BulkRequest.g.cs | 2 +- .../CcrDeleteAutoFollowPatternRequest.g.cs | 2 +- .../Api/Ccr/CcrFollowInfoRequest.g.cs | 2 +- .../_Generated/Api/Ccr/CcrFollowRequest.g.cs | 2 +- .../Api/Ccr/CcrFollowStatsRequest.g.cs | 2 +- .../Api/Ccr/CcrForgetFollowerRequest.g.cs | 2 +- .../Ccr/CcrGetAutoFollowPatternRequest.g.cs | 2 +- .../Ccr/CcrPauseAutoFollowPatternRequest.g.cs | 2 +- .../Api/Ccr/CcrPauseFollowRequest.g.cs | 2 +- .../Ccr/CcrPutAutoFollowPatternRequest.g.cs | 2 +- .../CcrResumeAutoFollowPatternRequest.g.cs | 2 +- .../Api/Ccr/CcrResumeFollowRequest.g.cs | 2 +- .../_Generated/Api/Ccr/CcrStatsRequest.g.cs | 2 +- .../Api/Ccr/CcrUnfollowRequest.g.cs | 2 +- .../_Generated/Api/ClearScrollRequest.g.cs | 2 +- .../Api/ClosePointInTimeRequest.g.cs | 2 +- .../ClusterAllocationExplainRequest.g.cs | 2 +- ...ClusterDeleteComponentTemplateRequest.g.cs | 2 +- ...erDeleteVotingConfigExclusionsRequest.g.cs | 2 +- ...ClusterExistsComponentTemplateRequest.g.cs | 2 +- .../ClusterGetComponentTemplateRequest.g.cs | 2 +- .../Cluster/ClusterGetSettingsRequest.g.cs | 2 +- .../Api/Cluster/ClusterHealthRequest.g.cs | 2 +- .../Cluster/ClusterPendingTasksRequest.g.cs | 2 +- ...sterPostVotingConfigExclusionsRequest.g.cs | 2 +- .../ClusterPutComponentTemplateRequest.g.cs | 2 +- .../Cluster/ClusterPutSettingsRequest.g.cs | 2 +- .../Api/Cluster/ClusterRemoteInfoRequest.g.cs | 2 +- .../Api/Cluster/ClusterRerouteRequest.g.cs | 2 +- .../Api/Cluster/ClusterStateRequest.g.cs | 2 +- .../Api/Cluster/ClusterStatsRequest.g.cs | 2 +- .../_Generated/Api/CreateRequest.g.cs | 2 +- ...lingIndicesListDanglingIndicesRequest.g.cs | 2 +- .../_Generated/Api/DeleteByQueryRequest.g.cs | 2 +- .../Api/DeleteByQueryRethrottleRequest.g.cs | 2 +- .../_Generated/Api/DeleteScriptRequest.g.cs | 2 +- .../Api/Enrich/EnrichDeletePolicyRequest.g.cs | 2 +- .../Enrich/EnrichExecutePolicyRequest.g.cs | 2 +- .../Api/Enrich/EnrichGetPolicyRequest.g.cs | 2 +- .../Api/Enrich/EnrichPutPolicyRequest.g.cs | 2 +- .../Api/Enrich/EnrichStatsRequest.g.cs | 2 +- .../_Generated/Api/Eql/DeleteEqlRequest.g.cs | 2 +- .../Api/Eql/EqlGetStatusRequest.g.cs | 2 +- .../_Generated/Api/Eql/EqlSearchRequest.g.cs | 2 +- .../_Generated/Api/Eql/GetEqlRequest.g.cs | 2 +- .../_Generated/Api/ExistsRequest.g.cs | 2 +- .../_Generated/Api/ExistsSourceRequest.g.cs | 2 +- .../_Generated/Api/ExplainRequest.g.cs | 2 +- .../Features/FeaturesGetFeaturesRequest.g.cs | 2 +- .../_Generated/Api/FieldCapsRequest.g.cs | 2 +- .../_Generated/Api/GetRequest.g.cs | 2 +- .../Api/Graph/GraphExploreRequest.g.cs | 2 +- .../Api/Ilm/IlmDeleteLifecycleRequest.g.cs | 2 +- .../Api/Ilm/IlmExplainLifecycleRequest.g.cs | 2 +- .../Api/Ilm/IlmGetLifecycleRequest.g.cs | 2 +- .../Api/Ilm/IlmGetStatusRequest.g.cs | 2 +- .../Api/Ilm/IlmMigrateToDataTiersRequest.g.cs | 2 +- .../Api/Ilm/IlmMoveToStepRequest.g.cs | 2 +- .../Api/Ilm/IlmPutLifecycleRequest.g.cs | 2 +- .../Api/Ilm/IlmRemovePolicyRequest.g.cs | 2 +- .../_Generated/Api/Ilm/IlmRetryRequest.g.cs | 2 +- .../_Generated/Api/Ilm/IlmStartRequest.g.cs | 2 +- .../_Generated/Api/Ilm/IlmStopRequest.g.cs | 2 +- .../Api/IndexManagement/AliasRequest.g.cs | 2 +- .../Api/IndexManagement/AnalyzeRequest.g.cs | 2 +- .../IndexManagement/ClearCacheRequest.g.cs | 2 +- .../Api/IndexManagement/CloneRequest.g.cs | 2 +- .../Api/IndexManagement/CloseRequest.g.cs | 2 +- .../CreateDataStreamRequest.g.cs | 2 +- .../Api/IndexManagement/CreateRequest.g.cs | 2 +- .../IndexManagement/DataStreamRequest.g.cs | 2 +- .../DataStreamsStatsRequest.g.cs | 2 +- .../IndexManagement/DeleteAliasRequest.g.cs | 2 +- .../DeleteDataStreamRequest.g.cs | 2 +- .../DeleteIndexTemplateRequest.g.cs | 2 +- .../Api/IndexManagement/DeleteRequest.g.cs | 2 +- .../DeleteTemplateRequest.g.cs | 2 +- .../IndexManagement/ExistsAliasRequest.g.cs | 2 +- .../ExistsIndexTemplateRequest.g.cs | 2 +- .../Api/IndexManagement/ExistsRequest.g.cs | 2 +- .../ExistsTemplateRequest.g.cs | 2 +- .../IndexManagement/FieldMappingRequest.g.cs | 2 +- .../Api/IndexManagement/FlushRequest.g.cs | 2 +- .../IndexManagement/ForcemergeRequest.g.cs | 2 +- .../Api/IndexManagement/GetRequest.g.cs | 2 +- .../IndexManagement/IndexTemplateRequest.g.cs | 2 +- .../Api/IndexManagement/MappingRequest.g.cs | 2 +- .../MigrateToDataStreamRequest.g.cs | 2 +- .../Api/IndexManagement/OpenRequest.g.cs | 2 +- .../PromoteDataStreamRequest.g.cs | 2 +- .../Api/IndexManagement/PutAliasRequest.g.cs | 2 +- .../PutIndexTemplateRequest.g.cs | 2 +- .../IndexManagement/PutMappingRequest.g.cs | 2 +- .../IndexManagement/PutSettingsRequest.g.cs | 2 +- .../IndexManagement/PutTemplateRequest.g.cs | 2 +- .../Api/IndexManagement/RecoveryRequest.g.cs | 2 +- .../Api/IndexManagement/RefreshRequest.g.cs | 2 +- .../ReloadSearchAnalyzersRequest.g.cs | 2 +- .../IndexManagement/ResolveIndexRequest.g.cs | 2 +- .../Api/IndexManagement/RolloverRequest.g.cs | 2 +- .../Api/IndexManagement/SegmentsRequest.g.cs | 2 +- .../Api/IndexManagement/SettingsRequest.g.cs | 2 +- .../IndexManagement/ShardStoresRequest.g.cs | 2 +- .../Api/IndexManagement/ShrinkRequest.g.cs | 2 +- .../SimulateIndexTemplateRequest.g.cs | 2 +- .../SimulateTemplateRequest.g.cs | 2 +- .../Api/IndexManagement/SplitRequest.g.cs | 2 +- .../Api/IndexManagement/StatsRequest.g.cs | 2 +- .../Api/IndexManagement/TemplateRequest.g.cs | 2 +- .../IndexManagement/ValidateQueryRequest.g.cs | 2 +- .../_Generated/Api/IndexRequest.g.cs | 2 +- .../_Generated/Api/InfoRequest.g.cs | 2 +- .../Ingest/IngestDeletePipelineRequest.g.cs | 2 +- .../Api/Ingest/IngestGeoIpStatsRequest.g.cs | 2 +- .../Api/Ingest/IngestGetPipelineRequest.g.cs | 2 +- .../Ingest/IngestProcessorGrokRequest.g.cs | 2 +- .../Api/Ingest/IngestPutPipelineRequest.g.cs | 2 +- .../Api/Ingest/IngestSimulateRequest.g.cs | 2 +- .../Api/License/DeleteLicenseRequest.g.cs | 2 +- .../Api/License/GetLicenseRequest.g.cs | 2 +- .../License/LicenseGetBasicStatusRequest.g.cs | 2 +- .../License/LicenseGetTrialStatusRequest.g.cs | 2 +- .../Api/License/LicensePostRequest.g.cs | 2 +- .../License/LicensePostStartBasicRequest.g.cs | 2 +- .../License/LicensePostStartTrialRequest.g.cs | 2 +- .../LogstashDeletePipelineRequest.g.cs | 2 +- .../Logstash/LogstashPutPipelineRequest.g.cs | 2 +- .../MigrationDeprecationsRequest.g.cs | 2 +- ...grationGetFeatureUpgradeStatusRequest.g.cs | 2 +- .../MigrationPostFeatureUpgradeRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlCloseJobRequest.g.cs | 2 +- .../Api/Ml/MlDeleteCalendarEventRequest.g.cs | 2 +- .../Api/Ml/MlDeleteCalendarRequest.g.cs | 2 +- .../Ml/MlDeleteDataFrameAnalyticsRequest.g.cs | 2 +- .../Api/Ml/MlDeleteDatafeedRequest.g.cs | 2 +- .../Api/Ml/MlDeleteExpiredDataRequest.g.cs | 2 +- .../Api/Ml/MlDeleteFilterRequest.g.cs | 2 +- .../Api/Ml/MlDeleteForecastRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlDeleteJobRequest.g.cs | 2 +- .../Api/Ml/MlDeleteModelSnapshotRequest.g.cs | 2 +- .../Ml/MlDeleteTrainedModelAliasRequest.g.cs | 2 +- .../Api/Ml/MlDeleteTrainedModelRequest.g.cs | 2 +- .../Api/Ml/MlEstimateModelMemoryRequest.g.cs | 2 +- .../Api/Ml/MlEvaluateDataFrameRequest.g.cs | 2 +- .../MlExplainDataFrameAnalyticsRequest.g.cs | 186 ++--- .../_Generated/Api/Ml/MlFlushJobRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlForecastRequest.g.cs | 2 +- .../Api/Ml/MlGetCalendarEventsRequest.g.cs | 2 +- .../Api/Ml/MlGetCalendarsRequest.g.cs | 2 +- .../Ml/MlGetDataFrameAnalyticsRequest.g.cs | 2 +- .../MlGetDataFrameAnalyticsStatsRequest.g.cs | 2 +- .../Api/Ml/MlGetInfluencersRequest.g.cs | 2 +- .../Api/Ml/MlGetJobStatsRequest.g.cs | 2 +- .../Api/Ml/MlGetMemoryStatsRequest.g.cs | 2 +- .../Api/Ml/MlGetModelSnapshotsRequest.g.cs | 2 +- .../Api/Ml/MlGetOverallBucketsRequest.g.cs | 2 +- .../Api/Ml/MlGetRecordsRequest.g.cs | 2 +- .../Ml/MlGetTrainedModelsStatsRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlInfoRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlOpenJobRequest.g.cs | 2 +- .../Api/Ml/MlPostCalendarEventsRequest.g.cs | 2 +- .../MlPreviewDataFrameAnalyticsRequest.g.cs | 2 +- .../Api/Ml/MlPreviewDatafeedRequest.g.cs | 2 +- .../Api/Ml/MlPutCalendarJobRequest.g.cs | 2 +- .../Api/Ml/MlPutCalendarRequest.g.cs | 2 +- .../Ml/MlPutDataFrameAnalyticsRequest.g.cs | 186 ++--- .../Api/Ml/MlPutDatafeedRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlPutFilterRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlPutJobRequest.g.cs | 2 +- .../Api/Ml/MlPutTrainedModelAliasRequest.g.cs | 2 +- .../Api/Ml/MlPutTrainedModelRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlResetJobRequest.g.cs | 2 +- .../Api/Ml/MlRevertModelSnapshotRequest.g.cs | 2 +- .../Api/Ml/MlSetUpgradeModeRequest.g.cs | 2 +- .../Ml/MlStartDataFrameAnalyticsRequest.g.cs | 2 +- .../Api/Ml/MlStartDatafeedRequest.g.cs | 2 +- .../Ml/MlStopDataFrameAnalyticsRequest.g.cs | 2 +- .../Api/Ml/MlStopDatafeedRequest.g.cs | 2 +- .../Ml/MlUpdateDataFrameAnalyticsRequest.g.cs | 2 +- .../Api/Ml/MlUpdateDatafeedRequest.g.cs | 2 +- .../Api/Ml/MlUpdateFilterRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlUpdateJobRequest.g.cs | 2 +- .../Api/Ml/MlUpdateModelSnapshotRequest.g.cs | 2 +- .../Api/Ml/MlUpgradeJobSnapshotRequest.g.cs | 2 +- .../Api/Ml/MlValidateDetectorRequest.g.cs | 2 +- .../_Generated/Api/Ml/MlValidateRequest.g.cs | 2 +- .../_Generated/Api/MultiGetRequest.g.cs | 2 +- .../_Generated/Api/MultiSearchRequest.g.cs | 2 +- .../Api/Nodes/NodesHotThreadsRequest.g.cs | 2 +- .../Api/Nodes/NodesInfoRequest.g.cs | 2 +- .../NodesReloadSecureSettingsRequest.g.cs | 2 +- .../Api/Nodes/NodesStatsRequest.g.cs | 2 +- .../Api/Nodes/NodesUsageRequest.g.cs | 2 +- .../Api/OpenPointInTimeRequest.g.cs | 2 +- .../_Generated/Api/PingRequest.g.cs | 2 +- .../_Generated/Api/PutScriptRequest.g.cs | 2 +- .../_Generated/Api/RankEvalRequest.g.cs | 2 +- .../_Generated/Api/ReindexRequest.g.cs | 124 +-- .../Api/ReindexRethrottleRequest.g.cs | 2 +- .../_Generated/Api/ScriptContextRequest.g.cs | 2 +- .../Api/ScriptLanguagesRequest.g.cs | 2 +- .../_Generated/Api/ScriptRequest.g.cs | 2 +- .../_Generated/Api/ScrollRequest.g.cs | 2 +- .../_Generated/Api/SearchRequest.g.cs | 2 +- .../_Generated/Api/SearchShardsRequest.g.cs | 2 +- .../SearchableSnapshotsMountRequest.g.cs | 2 +- .../SearchableSnapshotsStatsRequest.g.cs | 2 +- .../Security/SecurityAuthenticateRequest.g.cs | 2 +- .../SecurityChangePasswordRequest.g.cs | 2 +- .../SecurityClearApiKeyCacheRequest.g.cs | 2 +- .../SecurityClearCachedPrivilegesRequest.g.cs | 2 +- .../SecurityClearCachedRealmsRequest.g.cs | 2 +- .../SecurityClearCachedRolesRequest.g.cs | 2 +- .../SecurityDeletePrivilegesRequest.g.cs | 2 +- .../SecurityDeleteRoleMappingRequest.g.cs | 2 +- .../Security/SecurityDeleteRoleRequest.g.cs | 2 +- .../Security/SecurityDeleteUserRequest.g.cs | 2 +- .../Security/SecurityDisableUserRequest.g.cs | 2 +- .../Security/SecurityEnableUserRequest.g.cs | 2 +- .../Security/SecurityGetApiKeyRequest.g.cs | 2 +- .../SecurityGetBuiltinPrivilegesRequest.g.cs | 2 +- .../SecurityGetPrivilegesRequest.g.cs | 2 +- .../SecurityGetRoleMappingRequest.g.cs | 2 +- .../Api/Security/SecurityGetRoleRequest.g.cs | 2 +- .../Api/Security/SecurityGetTokenRequest.g.cs | 2 +- .../Security/SecurityGrantApiKeyRequest.g.cs | 2 +- .../SecurityHasPrivilegesRequest.g.cs | 2 +- .../SecurityInvalidateApiKeyRequest.g.cs | 2 +- .../SecurityInvalidateTokenRequest.g.cs | 2 +- .../Api/Security/SecurityPutUserRequest.g.cs | 2 +- .../Security/SecurityQueryApiKeysRequest.g.cs | 2 +- .../SecuritySamlAuthenticateRequest.g.cs | 2 +- .../SecuritySamlCompleteLogoutRequest.g.cs | 2 +- .../SecuritySamlInvalidateRequest.g.cs | 2 +- .../Security/SecuritySamlLogoutRequest.g.cs | 2 +- ...uritySamlPrepareAuthenticationRequest.g.cs | 2 +- ...itySamlServiceProviderMetadataRequest.g.cs | 2 +- .../Api/Slm/SlmDeleteLifecycleRequest.g.cs | 2 +- .../Api/Slm/SlmExecuteLifecycleRequest.g.cs | 2 +- .../Api/Slm/SlmExecuteRetentionRequest.g.cs | 2 +- .../Api/Slm/SlmGetLifecycleRequest.g.cs | 2 +- .../Api/Slm/SlmGetStatsRequest.g.cs | 2 +- .../Api/Slm/SlmGetStatusRequest.g.cs | 2 +- .../Api/Slm/SlmPutLifecycleRequest.g.cs | 2 +- .../_Generated/Api/Slm/SlmStartRequest.g.cs | 2 +- .../_Generated/Api/Slm/SlmStopRequest.g.cs | 2 +- .../Api/Snapshot/CreateSnapshotRequest.g.cs | 2 +- .../Api/Snapshot/DeleteSnapshotRequest.g.cs | 2 +- .../Api/Snapshot/GetSnapshotRequest.g.cs | 2 +- .../SnapshotCleanupRepositoryRequest.g.cs | 2 +- .../Api/Snapshot/SnapshotCloneRequest.g.cs | 2 +- .../SnapshotCreateRepositoryRequest.g.cs | 2 +- .../SnapshotDeleteRepositoryRequest.g.cs | 2 +- .../SnapshotGetRepositoryRequest.g.cs | 2 +- .../Api/Snapshot/SnapshotRestoreRequest.g.cs | 2 +- .../Api/Snapshot/SnapshotStatusRequest.g.cs | 2 +- .../SnapshotVerifyRepositoryRequest.g.cs | 2 +- .../_Generated/Api/SourceRequest.g.cs | 2 +- .../Api/Sql/SqlClearCursorRequest.g.cs | 2 +- .../Api/Sql/SqlDeleteAsyncRequest.g.cs | 2 +- .../Api/Sql/SqlGetAsyncRequest.g.cs | 2 +- .../Api/Sql/SqlGetAsyncStatusRequest.g.cs | 2 +- .../_Generated/Api/Sql/SqlQueryRequest.g.cs | 2 +- .../Api/Ssl/SslCertificatesRequest.g.cs | 2 +- .../_Generated/Api/TermsEnumRequest.g.cs | 2 +- .../TransformDeleteTransformRequest.g.cs | 2 +- .../TransformGetTransformRequest.g.cs | 2 +- .../TransformGetTransformStatsRequest.g.cs | 2 +- .../TransformPreviewTransformRequest.g.cs | 2 +- .../TransformPutTransformRequest.g.cs | 2 +- .../TransformResetTransformRequest.g.cs | 2 +- .../TransformStartTransformRequest.g.cs | 2 +- .../TransformStopTransformRequest.g.cs | 2 +- .../TransformUpdateTransformRequest.g.cs | 2 +- .../TransformUpgradeTransformsRequest.g.cs | 2 +- .../_Generated/Api/UpdateByQueryRequest.g.cs | 124 +-- .../Api/UpdateByQueryRethrottleRequest.g.cs | 2 +- .../_Generated/Api/UpdateRequest.g.cs | 64 +- .../Api/Xpack/XpackInfoRequest.g.cs | 2 +- .../Api/Xpack/XpackUsageRequest.g.cs | 2 +- .../Types/AggregationBreakdown.g.cs | 2 +- .../_Generated/Types/AggregationProfile.g.cs | 2 +- .../Types/AggregationProfileDebug.g.cs | 2 +- ...AggregationProfileDelegateDebugFilter.g.cs | 2 +- .../AdjacencyMatrixAggregate.g.cs | 9 +- .../AdjacencyMatrixAggregation.g.cs | 159 +--- .../Aggregations/AdjacencyMatrixBucket.g.cs | 4 +- .../Types/Aggregations/AggregateBase.g.cs | 33 - .../Aggregations/AggregateDictionary.g.cs | 6 +- .../Aggregations/AggregationContainer.g.cs | 55 +- .../Types/Aggregations/AggregationRange.g.cs | 2 +- .../Aggregations/ArrayPercentilesItem.g.cs | 2 +- .../AutoDateHistogramAggregate.g.cs | 10 +- .../AutoDateHistogramAggregation.g.cs | 242 +----- .../Aggregations/AverageAggregation.g.cs | 159 ++-- .../Types/Aggregations/AvgAggregate.g.cs | 13 +- .../Types/Aggregations/BoxPlotAggregate.g.cs | 6 +- .../Aggregations/BoxplotAggregation.g.cs | 133 +-- .../Aggregations/BucketAggregationBase.g.cs | 37 - .../BucketPathAggregationBase.g.cs | 37 - .../Aggregations/CardinalityAggregate.g.cs | 6 +- .../Aggregations/CardinalityAggregation.g.cs | 179 ++-- .../Types/Aggregations/ChildrenAggregate.g.cs | 13 +- .../Aggregations/ChildrenAggregation.g.cs | 161 +--- .../Aggregations/CompositeAggregate.g.cs | 10 +- .../Aggregations/CompositeAggregation.g.cs | 191 +---- .../CompositeAggregationSource.g.cs | 2 +- .../Types/Aggregations/CompositeBucket.g.cs | 4 +- .../CumulativeCardinalityAggregate.g.cs | 6 +- .../CumulativeCardinalityAggregation.g.cs | 45 +- .../Aggregations/DateHistogramAggregate.g.cs | 9 +- .../DateHistogramAggregation.g.cs | 242 +----- .../Aggregations/DateHistogramBucket.g.cs | 4 +- .../Aggregations/DateRangeAggregate.g.cs | 9 +- .../Aggregations/DateRangeAggregation.g.cs | 118 +-- .../Aggregations/DateRangeExpression.g.cs | 2 +- .../Aggregations/DerivativeAggregate.g.cs | 14 +- .../Aggregations/DerivativeAggregation.g.cs | 45 +- .../Aggregations/DoubleTermsAggregate.g.cs | 17 +- .../Types/Aggregations/DoubleTermsBucket.g.cs | 4 +- .../Aggregations/ExtendedStatsAggregate.g.cs | 42 +- .../ExtendedStatsAggregation.g.cs | 173 ++-- .../ExtendedStatsBucketAggregate.g.cs | 89 +- .../ExtendedStatsBucketAggregation.g.cs | 39 +- .../Types/Aggregations/FilterAggregate.g.cs | 13 +- .../Types/Aggregations/FiltersAggregate.g.cs | 9 +- .../Aggregations/FiltersAggregation.g.cs | 191 +---- .../Types/Aggregations/FiltersBucket.g.cs | 4 +- .../FormatMetricAggregationBase.g.cs | 37 - .../FormattableMetricAggregationBase.g.cs | 37 - .../Types/Aggregations/GlobalAggregate.g.cs | 13 +- .../Types/Aggregations/GlobalAggregation.g.cs | 145 +--- .../Aggregations/HistogramAggregate.g.cs | 9 +- .../Aggregations/HistogramAggregation.g.cs | 238 +----- .../Types/Aggregations/HistogramBucket.g.cs | 4 +- .../Aggregations/InferenceAggregate.g.cs | 6 +- .../Aggregations/InferenceAggregation.g.cs | 61 +- .../InferenceClassImportance.g.cs | 2 +- .../InferenceConfigContainer.g.cs | 2 +- .../InferenceFeatureImportance.g.cs | 2 +- .../Aggregations/InferenceTopClassEntry.g.cs | 2 +- .../Types/Aggregations/IpRangeAggregate.g.cs | 9 +- .../Aggregations/IpRangeAggregation.g.cs | 118 +-- .../Aggregations/IpRangeAggregationRange.g.cs | 2 +- .../Types/Aggregations/IpRangeBucket.g.cs | 4 +- .../Aggregations/LongTermsAggregate.g.cs | 17 +- .../Types/Aggregations/LongTermsBucket.g.cs | 4 +- .../Aggregations/MatrixAggregationBase.g.cs | 41 - .../Aggregations/MatrixStatsAggregate.g.cs | 6 +- .../Aggregations/MatrixStatsAggregation.g.cs | 43 +- .../Types/Aggregations/MatrixStatsFields.g.cs | 2 +- .../Types/Aggregations/MaxAggregate.g.cs | 13 +- .../Types/Aggregations/MaxAggregation.g.cs | 159 ++-- .../MedianAbsoluteDeviationAggregate.g.cs | 13 +- .../MedianAbsoluteDeviationAggregation.g.cs | 159 ++-- .../Aggregations/MetricAggregationBase.g.cs | 41 - .../Types/Aggregations/MinAggregate.g.cs | 13 +- .../Types/Aggregations/MinAggregation.g.cs | 159 ++-- .../Types/Aggregations/MissingAggregate.g.cs | 13 +- .../Aggregations/MissingAggregation.g.cs | 118 +-- .../MultiBucketAggregateBase.g.cs | 30 - .../Types/Aggregations/MultiBucketBase.g.cs | 37 - .../Types/Aggregations/MultiTermLookup.g.cs | 2 +- .../Aggregations/MultiTermsAggregate.g.cs | 17 +- .../Aggregations/MultiTermsAggregation.g.cs | 118 +-- .../Types/Aggregations/MultiTermsBucket.g.cs | 4 +- .../Types/Aggregations/NestedAggregate.g.cs | 13 +- .../Types/Aggregations/NestedAggregation.g.cs | 118 +-- .../Types/Aggregations/ParentAggregate.g.cs | 13 +- .../Types/Aggregations/ParentAggregation.g.cs | 161 +--- .../PercentilesAggregateBase.g.cs | 33 - .../PercentilesBucketAggregate.g.cs | 9 +- .../PercentilesBucketAggregation.g.cs | 39 +- .../Aggregations/PipelineAggregationBase.g.cs | 41 - .../Types/Aggregations/RangeAggregate.g.cs | 9 +- .../Types/Aggregations/RangeAggregation.g.cs | 238 +----- .../Types/Aggregations/RangeBucket.g.cs | 4 +- .../Types/Aggregations/RateAggregate.g.cs | 6 +- .../Types/Aggregations/RateAggregation.g.cs | 191 ++--- .../Aggregations/ReverseNestedAggregate.g.cs | 13 +- .../ReverseNestedAggregation.g.cs | 118 +-- .../Types/Aggregations/SamplerAggregate.g.cs | 13 +- .../Aggregations/SamplerAggregation.g.cs | 161 +--- .../Aggregations/ScriptedMetricAggregate.g.cs | 6 +- .../ScriptedMetricAggregation.g.cs | 531 +++--------- .../SingleBucketAggregateBase.g.cs | 37 - .../SingleMetricAggregateBase.g.cs | 37 - .../Aggregations/StandardDeviationBounds.g.cs | 2 +- .../StandardDeviationBoundsAsString.g.cs | 2 +- .../Types/Aggregations/StatsAggregate.g.cs | 6 +- .../Types/Aggregations/StatsAggregation.g.cs | 159 ++-- .../Aggregations/StatsBucketAggregate.g.cs | 41 +- .../Aggregations/StatsBucketAggregation.g.cs | 45 +- .../Aggregations/StringStatsAggregate.g.cs | 6 +- .../Aggregations/StringStatsAggregation.g.cs | 161 ++-- .../Aggregations/StringTermsAggregate.g.cs | 17 +- .../Types/Aggregations/StringTermsBucket.g.cs | 4 +- .../Types/Aggregations/SumAggregate.g.cs | 13 +- .../Types/Aggregations/SumAggregation.g.cs | 159 ++-- .../TDigestPercentileRanksAggregate.g.cs | 9 +- .../Types/Aggregations/TTestAggregate.g.cs | 6 +- .../Types/Aggregations/TTestAggregation.g.cs | 9 +- .../Aggregations/TermsAggregateBase.g.cs | 37 - .../Types/Aggregations/TermsAggregation.g.cs | 242 +----- .../Types/Aggregations/TermsBucketBase.g.cs | 33 - .../Types/Aggregations/TermsPartition.g.cs | 2 +- .../Types/Aggregations/TestPopulation.g.cs | 110 +-- .../Types/Aggregations/TopHitsAggregate.g.cs | 6 +- .../Aggregations/TopHitsAggregation.g.cs | 207 ++--- .../Types/Aggregations/TopMetrics.g.cs | 2 +- .../Aggregations/TopMetricsAggregate.g.cs | 6 +- .../Aggregations/TopMetricsAggregation.g.cs | 185 ++--- .../Types/Aggregations/TopMetricsValue.g.cs | 2 +- .../Aggregations/ValueCountAggregate.g.cs | 13 +- .../Aggregations/ValueCountAggregation.g.cs | 159 ++-- .../VariableWidthHistogramAggregate.g.cs | 9 +- .../VariableWidthHistogramAggregation.g.cs | 9 +- .../VariableWidthHistogramBucket.g.cs | 4 +- .../WeightedAverageAggregation.g.cs | 9 +- .../Aggregations/WeightedAverageValue.g.cs | 120 +-- .../Aggregations/WeightedAvgAggregate.g.cs | 13 +- .../Analysis/AsciiFoldingTokenFilter.g.cs | 5 +- .../Types/Analysis/CharFilterBase.g.cs | 33 - .../Types/Analysis/CharGroupTokenizer.g.cs | 5 +- .../Analysis/CommonGramsTokenFilter.g.cs | 5 +- .../Analysis/CompoundWordTokenFilterBase.g.cs | 57 -- .../Types/Analysis/ConditionTokenFilter.g.cs | 77 +- .../Types/Analysis/CustomAnalyzer.g.cs | 2 +- .../Types/Analysis/CustomNormalizer.g.cs | 2 +- .../Analysis/DelimitedPayloadTokenFilter.g.cs | 5 +- .../DictionaryDecompounderTokenFilter.g.cs | 33 +- .../Types/Analysis/DutchAnalyzer.g.cs | 2 +- .../Types/Analysis/EdgeNGramTokenFilter.g.cs | 5 +- .../Types/Analysis/EdgeNGramTokenizer.g.cs | 5 +- .../Types/Analysis/ElisionTokenFilter.g.cs | 5 +- .../Types/Analysis/FingerprintAnalyzer.g.cs | 2 +- .../Analysis/FingerprintTokenFilter.g.cs | 5 +- .../Types/Analysis/HtmlStripCharFilter.g.cs | 5 +- .../Types/Analysis/HunspellTokenFilter.g.cs | 5 +- .../HyphenationDecompounderTokenFilter.g.cs | 33 +- .../Types/Analysis/IcuAnalyzer.g.cs | 2 +- .../Analysis/IcuCollationTokenFilter.g.cs | 6 +- .../Types/Analysis/IcuFoldingTokenFilter.g.cs | 6 +- .../Analysis/IcuNormalizationCharFilter.g.cs | 5 +- .../Analysis/IcuNormalizationTokenFilter.g.cs | 5 +- .../Types/Analysis/IcuTokenizer.g.cs | 5 +- .../Analysis/IcuTransformTokenFilter.g.cs | 5 +- .../Types/Analysis/KStemTokenFilter.g.cs | 5 +- .../Types/Analysis/KeepTypesTokenFilter.g.cs | 6 +- .../Types/Analysis/KeepWordsTokenFilter.g.cs | 5 +- .../Types/Analysis/KeywordAnalyzer.g.cs | 2 +- .../Analysis/KeywordMarkerTokenFilter.g.cs | 5 +- .../Types/Analysis/KeywordTokenizer.g.cs | 5 +- .../Types/Analysis/KuromojiAnalyzer.g.cs | 2 +- .../KuromojiIterationMarkCharFilter.g.cs | 5 +- .../KuromojiPartOfSpeechTokenFilter.g.cs | 5 +- .../KuromojiReadingFormTokenFilter.g.cs | 6 +- .../Analysis/KuromojiStemmerTokenFilter.g.cs | 5 +- .../Types/Analysis/KuromojiTokenizer.g.cs | 6 +- .../Types/Analysis/LanguageAnalyzer.g.cs | 2 +- .../Types/Analysis/LengthTokenFilter.g.cs | 5 +- .../Types/Analysis/LetterTokenizer.g.cs | 5 +- .../Analysis/LimitTokenCountTokenFilter.g.cs | 5 +- .../Types/Analysis/LowercaseNormalizer.g.cs | 2 +- .../Types/Analysis/LowercaseTokenFilter.g.cs | 5 +- .../Types/Analysis/LowercaseTokenizer.g.cs | 5 +- .../Types/Analysis/MappingCharFilter.g.cs | 5 +- .../Analysis/MultiplexerTokenFilter.g.cs | 5 +- .../Types/Analysis/NGramTokenFilter.g.cs | 5 +- .../Types/Analysis/NGramTokenizer.g.cs | 5 +- .../Types/Analysis/NoriAnalyzer.g.cs | 2 +- .../Analysis/NoriPartOfSpeechTokenFilter.g.cs | 5 +- .../Types/Analysis/NoriTokenizer.g.cs | 6 +- .../Analysis/PathHierarchyTokenizer.g.cs | 5 +- .../Types/Analysis/PatternAnalyzer.g.cs | 2 +- .../Analysis/PatternCaptureTokenFilter.g.cs | 5 +- .../Analysis/PatternReplaceCharFilter.g.cs | 5 +- .../Analysis/PatternReplaceTokenFilter.g.cs | 5 +- .../Types/Analysis/PatternTokenizer.g.cs | 5 +- .../Types/Analysis/PhoneticTokenFilter.g.cs | 5 +- .../Types/Analysis/PorterStemTokenFilter.g.cs | 5 +- .../Types/Analysis/PredicateTokenFilter.g.cs | 77 +- .../Analysis/RemoveDuplicatesTokenFilter.g.cs | 5 +- .../Types/Analysis/ReverseTokenFilter.g.cs | 5 +- .../Types/Analysis/ShingleTokenFilter.g.cs | 5 +- .../Types/Analysis/SimpleAnalyzer.g.cs | 2 +- .../Types/Analysis/SnowballAnalyzer.g.cs | 2 +- .../Types/Analysis/SnowballTokenFilter.g.cs | 5 +- .../Types/Analysis/StandardAnalyzer.g.cs | 2 +- .../Types/Analysis/StandardTokenizer.g.cs | 5 +- .../Analysis/StemmerOverrideTokenFilter.g.cs | 5 +- .../Types/Analysis/StemmerTokenFilter.g.cs | 5 +- .../Types/Analysis/StopAnalyzer.g.cs | 2 +- .../Types/Analysis/StopTokenFilter.g.cs | 5 +- .../Analysis/SynonymGraphTokenFilter.g.cs | 6 +- .../Types/Analysis/SynonymTokenFilter.g.cs | 6 +- .../Types/Analysis/TokenFilterBase.g.cs | 33 - .../Types/Analysis/TokenizerBase.g.cs | 33 - .../Types/Analysis/TrimTokenFilter.g.cs | 5 +- .../Types/Analysis/TruncateTokenFilter.g.cs | 5 +- .../Types/Analysis/UaxEmailUrlTokenizer.g.cs | 5 +- .../Types/Analysis/UniqueTokenFilter.g.cs | 5 +- .../Types/Analysis/UppercaseTokenFilter.g.cs | 5 +- .../Types/Analysis/WhitespaceAnalyzer.g.cs | 2 +- .../Types/Analysis/WhitespaceTokenizer.g.cs | 5 +- .../WordDelimiterGraphTokenFilter.g.cs | 6 +- .../Analysis/WordDelimiterTokenFilter.g.cs | 6 +- .../Types/AsyncSearch/AsyncSearch.g.cs | 2 +- .../Autoscaling/AutoscalingCapacity.g.cs | 2 +- .../Types/Autoscaling/AutoscalingDecider.g.cs | 2 +- .../Autoscaling/AutoscalingDeciders.g.cs | 2 +- .../Types/Autoscaling/AutoscalingNode.g.cs | 2 +- .../Autoscaling/AutoscalingResources.g.cs | 2 +- .../Types/BulkIndexByScrollFailure.g.cs | 2 +- .../_Generated/Types/BulkStats.g.cs | 2 +- .../Types/Ccr/AutoFollowPattern.g.cs | 2 +- .../Types/Ccr/AutoFollowPatternSummary.g.cs | 2 +- .../_Generated/Types/Ccr/AutoFollowStats.g.cs | 2 +- .../Types/Ccr/AutoFollowedCluster.g.cs | 2 +- .../Types/Ccr/FollowIndexStats.g.cs | 2 +- .../_Generated/Types/Ccr/FollowStats.g.cs | 2 +- .../_Generated/Types/Ccr/FollowerIndex.g.cs | 2 +- .../Types/Ccr/FollowerIndexParameters.g.cs | 2 +- .../_Generated/Types/Ccr/ReadException.g.cs | 2 +- .../_Generated/Types/Ccr/ShardStats.g.cs | 2 +- .../Types/Cluster/AllocationDecision.g.cs | 2 +- .../Types/Cluster/AllocationStore.g.cs | 2 +- .../Types/Cluster/CharFilterTypes.g.cs | 2 +- .../Types/Cluster/ClusterFileSystem.g.cs | 2 +- .../Types/Cluster/ClusterIndices.g.cs | 2 +- .../Types/Cluster/ClusterIndicesShards.g.cs | 2 +- .../Cluster/ClusterIndicesShardsIndex.g.cs | 2 +- .../_Generated/Types/Cluster/ClusterInfo.g.cs | 2 +- .../Types/Cluster/ClusterIngest.g.cs | 2 +- .../_Generated/Types/Cluster/ClusterJvm.g.cs | 2 +- .../Types/Cluster/ClusterJvmMemory.g.cs | 2 +- .../Types/Cluster/ClusterJvmVersion.g.cs | 2 +- .../Types/Cluster/ClusterNetworkTypes.g.cs | 2 +- .../Types/Cluster/ClusterNodeCount.g.cs | 2 +- .../Types/Cluster/ClusterNodes.g.cs | 2 +- .../Types/Cluster/ClusterOperatingSystem.g.cs | 2 +- .../ClusterOperatingSystemArchitecture.g.cs | 2 +- .../Cluster/ClusterOperatingSystemName.g.cs | 2 +- .../ClusterOperatingSystemPrettyName.g.cs | 2 +- .../Types/Cluster/ClusterProcess.g.cs | 2 +- .../Types/Cluster/ClusterProcessCpu.g.cs | 2 +- .../ClusterProcessOpenFileDescriptors.g.cs | 2 +- .../Types/Cluster/ClusterProcessor.g.cs | 2 +- .../Types/Cluster/ClusterShardMetrics.g.cs | 2 +- .../_Generated/Types/Cluster/Command.g.cs | 2 +- .../Cluster/CommandAllocatePrimaryAction.g.cs | 2 +- .../Cluster/CommandAllocateReplicaAction.g.cs | 2 +- .../Types/Cluster/CommandCancelAction.g.cs | 2 +- .../Types/Cluster/CommandMoveAction.g.cs | 2 +- .../Types/Cluster/ComponentTemplate.g.cs | 2 +- .../_Generated/Types/Cluster/CurrentNode.g.cs | 2 +- .../_Generated/Types/Cluster/DiskUsage.g.cs | 2 +- .../_Generated/Types/Cluster/FieldTypes.g.cs | 2 +- .../Types/Cluster/FieldTypesMappings.g.cs | 2 +- .../Types/Cluster/IndexHealthStats.g.cs | 2 +- .../Types/Cluster/IndexingPressure.g.cs | 2 +- .../Types/Cluster/IndexingPressureMemory.g.cs | 2 +- .../IndexingPressureMemorySummary.g.cs | 2 +- .../Types/Cluster/IndicesVersions.g.cs | 2 +- .../Cluster/NodeAllocationExplanation.g.cs | 2 +- .../Types/Cluster/NodeDiskUsage.g.cs | 2 +- .../Types/Cluster/NodePackagingType.g.cs | 2 +- .../Cluster/OperatingSystemMemoryInfo.g.cs | 2 +- .../_Generated/Types/Cluster/PendingTask.g.cs | 2 +- .../Types/Cluster/RerouteDecision.g.cs | 2 +- .../Types/Cluster/RerouteExplanation.g.cs | 2 +- .../Types/Cluster/RerouteParameters.g.cs | 2 +- .../Types/Cluster/ReservedSize.g.cs | 2 +- .../Types/Cluster/RuntimeFieldTypes.g.cs | 2 +- .../Types/Cluster/ShardHealthStats.g.cs | 2 +- .../Types/Cluster/UnassignedInformation.g.cs | 2 +- .../_Generated/Types/ClusterStatistics.g.cs | 2 +- .../_Generated/Types/Collector.g.cs | 2 +- .../_Generated/Types/CompletionContext.g.cs | 2 +- .../_Generated/Types/CompletionStats.g.cs | 2 +- .../_Generated/Types/CompletionSuggester.g.cs | 14 +- .../_Generated/Types/ContextMethod.g.cs | 2 +- .../_Generated/Types/ContextMethodParam.g.cs | 2 +- .../_Generated/Types/CoordsGeoBounds.g.cs | 2 +- .../Types/DanglingIndices/DanglingIndex.g.cs | 2 +- .../_Generated/Types/Destination.g.cs | 2 +- .../_Generated/Types/DirectGenerator.g.cs | 2 +- .../_Generated/Types/DocStats.g.cs | 2 +- .../_Generated/Types/DocumentRating.g.cs | 2 +- .../Types/ElasticsearchVersionInfo.g.cs | 2 +- .../_Generated/Types/Enrich/CacheStats.g.cs | 2 +- .../Types/Enrich/Configuration.g.cs | 2 +- .../Types/Enrich/CoordinatorStats.g.cs | 2 +- .../Enrich/ExecuteEnrichPolicyStatus.g.cs | 2 +- .../Types/Enrich/ExecutingPolicy.g.cs | 2 +- .../_Generated/Types/Enrich/Policy.g.cs | 2 +- .../_Generated/Types/Enrich/Summary.g.cs | 2 +- .../Types/Enums/Enums.Aggregations.g.cs | 63 ++ .../_Generated/Types/Eql/EqlHits.g.cs | 2 +- .../_Generated/Types/Eql/HitsEvent.g.cs | 2 +- .../_Generated/Types/Eql/HitsSequence.g.cs | 2 +- .../_Generated/Types/ErrorCause.g.cs | 2 +- .../_Generated/Types/ErrorResponseBase.g.cs | 2 +- .../_Generated/Types/Explanation.g.cs | 2 +- .../_Generated/Types/ExplanationDetail.g.cs | 2 +- .../_Generated/Types/Features/Feature.g.cs | 2 +- .../_Generated/Types/FetchProfile.g.cs | 2 +- .../Types/FetchProfileBreakdown.g.cs | 2 +- .../_Generated/Types/FetchProfileDebug.g.cs | 2 +- .../_Generated/Types/FieldCapability.g.cs | 2 +- .../_Generated/Types/FieldCollapse.g.cs | 2 +- .../_Generated/Types/FieldMemoryUsage.g.cs | 2 +- .../_Generated/Types/FieldSizeUsage.g.cs | 2 +- .../_Generated/Types/FieldSort.g.cs | 2 +- .../_Generated/Types/FieldSuggester.g.cs | 2 +- .../_Generated/Types/FielddataStats.g.cs | 2 +- .../_Generated/Types/FlushStats.g.cs | 2 +- .../_Generated/Types/GeoDistanceSort.g.cs | 2 +- .../_Generated/Types/GeoHashLocation.g.cs | 2 +- .../_Generated/Types/GetResult.g.cs | 2 +- .../_Generated/Types/GetStats.g.cs | 2 +- .../_Generated/Types/Graph/Connection.g.cs | 2 +- .../Types/Graph/ExploreControls.g.cs | 2 +- .../_Generated/Types/Graph/Hop.g.cs | 2 +- .../Types/Graph/SampleDiversity.g.cs | 2 +- .../_Generated/Types/Graph/Vertex.g.cs | 2 +- .../Types/Graph/VertexDefinition.g.cs | 2 +- .../_Generated/Types/Graph/VertexInclude.g.cs | 2 +- .../_Generated/Types/Highlight.g.cs | 86 +- .../_Generated/Types/HighlightBase.g.cs | 113 --- .../_Generated/Types/HighlightField.g.cs | 86 +- .../_Generated/Types/Hit.g.cs | 2 +- .../_Generated/Types/HitsMetadata.g.cs | 2 +- .../_Generated/Types/Ilm/Configurations.g.cs | 2 +- .../Types/Ilm/ForceMergeConfiguration.g.cs | 2 +- .../Types/Ilm/LifecycleExplainManaged.g.cs | 2 +- .../Ilm/LifecycleExplainPhaseExecution.g.cs | 2 +- .../Types/Ilm/LifecycleExplainUnmanaged.g.cs | 2 +- .../_Generated/Types/Ilm/Phase.g.cs | 2 +- .../_Generated/Types/Ilm/Phases.g.cs | 2 +- .../Types/Ilm/ShrinkConfiguration.g.cs | 2 +- .../_Generated/Types/Ilm/StepKey.g.cs | 2 +- .../Types/IndexManagement/Alias.g.cs | 2 +- .../IndexManagement/AliasDefinition.g.cs | 2 +- .../Types/IndexManagement/AnalyzeDetail.g.cs | 2 +- .../Types/IndexManagement/AnalyzeToken.g.cs | 2 +- .../Types/IndexManagement/AnalyzerDetail.g.cs | 2 +- .../Types/IndexManagement/CacheQueries.g.cs | 2 +- .../IndexManagement/CharFilterDetail.g.cs | 2 +- .../IndexManagement/CloseIndexResult.g.cs | 2 +- .../IndexManagement/CloseShardResult.g.cs | 2 +- .../Types/IndexManagement/DataStream.g.cs | 2 +- .../IndexManagement/DataStreamIndex.g.cs | 2 +- .../DataStreamTimestampField.g.cs | 2 +- .../IndexManagement/DataStreamVisibility.g.cs | 2 +- .../IndexManagement/DataStreamsStatsItem.g.cs | 2 +- .../IndexManagement/ExplainAnalyzeToken.g.cs | 2 +- .../FielddataFrequencyFilter.g.cs | 2 +- .../Types/IndexManagement/IndexRouting.g.cs | 2 +- .../IndexRoutingAllocation.g.cs | 2 +- .../IndexRoutingAllocationDisk.g.cs | 2 +- .../IndexRoutingAllocationInclude.g.cs | 2 +- ...IndexRoutingAllocationInitialRecovery.g.cs | 2 +- .../IndexRoutingRebalance.g.cs | 2 +- .../Types/IndexManagement/IndexSegment.g.cs | 2 +- .../IndexManagement/IndexSegmentSort.g.cs | 2 +- .../IndexManagement/IndexSettingBlocks.g.cs | 2 +- .../Types/IndexManagement/IndexSettings.g.cs | 2 +- .../IndexSettingsAnalysis.g.cs | 2 +- .../IndexSettingsLifecycle.g.cs | 2 +- .../IndexSettingsLifecycleStep.g.cs | 2 +- .../IndexSettingsTimeSeries.g.cs | 2 +- .../Types/IndexManagement/IndexState.g.cs | 2 +- .../Types/IndexManagement/IndexStats.g.cs | 2 +- .../Types/IndexManagement/IndexTemplate.g.cs | 2 +- .../IndexTemplateDataStreamConfiguration.g.cs | 2 +- .../IndexManagement/IndexTemplateItem.g.cs | 2 +- .../IndexManagement/IndexTemplateMapping.g.cs | 2 +- .../IndexManagement/IndexTemplateSummary.g.cs | 2 +- .../IndexManagement/IndexVersioning.g.cs | 2 +- .../IndexManagement/IndexingPressure.g.cs | 2 +- .../IndexingPressureMemory.g.cs | 2 +- .../IndexManagement/IndicesShardStores.g.cs | 2 +- .../Types/IndexManagement/IndicesStats.g.cs | 2 +- .../IndicesValidationExplanation.g.cs | 2 +- .../IndexManagement/MappingLimitSettings.g.cs | 2 +- .../MappingLimitSettingsDepth.g.cs | 2 +- .../MappingLimitSettingsDimensionFields.g.cs | 2 +- .../MappingLimitSettingsFieldNameLength.g.cs | 2 +- .../MappingLimitSettingsNestedFields.g.cs | 2 +- .../MappingLimitSettingsNestedObjects.g.cs | 2 +- .../MappingLimitSettingsTotalFields.g.cs | 2 +- .../Types/IndexManagement/Merge.g.cs | 2 +- .../Types/IndexManagement/MergeScheduler.g.cs | 2 +- .../IndexManagement/NumericFielddata.g.cs | 2 +- .../Types/IndexManagement/Overlapping.g.cs | 2 +- .../Types/IndexManagement/Queries.g.cs | 2 +- .../Types/IndexManagement/ReloadDetails.g.cs | 2 +- .../ResolveIndexAliasItem.g.cs | 2 +- .../ResolveIndexDataStreamsItem.g.cs | 2 +- .../IndexManagement/ResolveIndexItem.g.cs | 2 +- .../Types/IndexManagement/RetentionLease.g.cs | 2 +- .../IndexManagement/RolloverConditions.g.cs | 2 +- .../Types/IndexManagement/SearchIdle.g.cs | 2 +- .../Types/IndexManagement/Segment.g.cs | 2 +- .../IndexManagement/SettingsAnalyze.g.cs | 2 +- .../IndexManagement/SettingsHighlight.g.cs | 2 +- .../IndexManagement/SettingsQueryString.g.cs | 2 +- .../Types/IndexManagement/SettingsSearch.g.cs | 2 +- .../IndexManagement/SettingsSimilarity.g.cs | 2 +- .../SettingsSimilarityBm25.g.cs | 2 +- .../SettingsSimilarityDfi.g.cs | 2 +- .../SettingsSimilarityDfr.g.cs | 2 +- .../IndexManagement/SettingsSimilarityIb.g.cs | 2 +- .../SettingsSimilarityLmd.g.cs | 2 +- .../SettingsSimilarityLmj.g.cs | 2 +- .../SettingsSimilarityScriptedTfidf.g.cs | 48 +- .../Types/IndexManagement/ShardCommit.g.cs | 2 +- .../IndexManagement/ShardFileSizeInfo.g.cs | 2 +- .../Types/IndexManagement/ShardLease.g.cs | 2 +- .../Types/IndexManagement/ShardPath.g.cs | 2 +- .../IndexManagement/ShardQueryCache.g.cs | 2 +- .../IndexManagement/ShardRetentionLeases.g.cs | 2 +- .../Types/IndexManagement/ShardRouting.g.cs | 2 +- .../IndexManagement/ShardSegmentRouting.g.cs | 2 +- .../IndexManagement/ShardSequenceNumber.g.cs | 2 +- .../Types/IndexManagement/ShardStats.g.cs | 2 +- .../Types/IndexManagement/ShardStore.g.cs | 2 +- .../IndexManagement/ShardStoreException.g.cs | 2 +- .../IndexManagement/ShardStoreWrapper.g.cs | 2 +- .../Types/IndexManagement/ShardsSegment.g.cs | 2 +- .../IndexManagement/ShardsTotalStats.g.cs | 2 +- .../IndexManagement/SlowlogSettings.g.cs | 2 +- .../SlowlogTresholdLevels.g.cs | 2 +- .../IndexManagement/SlowlogTresholds.g.cs | 2 +- .../Types/IndexManagement/SoftDeletes.g.cs | 2 +- .../Types/IndexManagement/Storage.g.cs | 2 +- .../Types/IndexManagement/Template.g.cs | 2 +- .../Types/IndexManagement/TokenDetail.g.cs | 2 +- .../Types/IndexManagement/Translog.g.cs | 2 +- .../IndexManagement/TranslogRetention.g.cs | 2 +- .../_Generated/Types/IndexingStats.g.cs | 2 +- .../_Generated/Types/IndicesOptions.g.cs | 2 +- .../Types/Ingest/AppendProcessor.g.cs | 18 +- .../Types/Ingest/AttachmentProcessor.g.cs | 18 +- .../Types/Ingest/BytesProcessor.g.cs | 18 +- .../Types/Ingest/CircleProcessor.g.cs | 18 +- .../Types/Ingest/ConvertProcessor.g.cs | 18 +- .../_Generated/Types/Ingest/CsvProcessor.g.cs | 18 +- .../Types/Ingest/DateIndexNameProcessor.g.cs | 18 +- .../Types/Ingest/DateProcessor.g.cs | 18 +- .../Types/Ingest/DissectProcessor.g.cs | 18 +- .../_Generated/Types/Ingest/Document.g.cs | 2 +- .../Types/Ingest/DocumentSimulation.g.cs | 2 +- .../Types/Ingest/DotExpanderProcessor.g.cs | 18 +- .../Types/Ingest/DropProcessor.g.cs | 17 +- .../Types/Ingest/EnrichProcessor.g.cs | 18 +- .../Types/Ingest/FailProcessor.g.cs | 18 +- .../Types/Ingest/ForeachProcessor.g.cs | 18 +- .../Types/Ingest/GeoIpDownloadStatistics.g.cs | 2 +- .../Types/Ingest/GeoIpNodeDatabaseName.g.cs | 2 +- .../Types/Ingest/GeoIpNodeDatabases.g.cs | 2 +- .../Types/Ingest/GeoIpProcessor.g.cs | 18 +- .../Types/Ingest/GrokProcessor.g.cs | 18 +- .../Types/Ingest/GsubProcessor.g.cs | 18 +- .../Types/Ingest/InferenceConfig.g.cs | 2 +- .../Ingest/InferenceConfigClassification.g.cs | 2 +- .../Ingest/InferenceConfigRegression.g.cs | 2 +- .../Types/Ingest/InferenceProcessor.g.cs | 18 +- .../_Generated/Types/Ingest/Ingest.g.cs | 2 +- .../Types/Ingest/JoinProcessor.g.cs | 18 +- .../Types/Ingest/JsonProcessor.g.cs | 18 +- .../Types/Ingest/KeyValueProcessor.g.cs | 18 +- .../Types/Ingest/LowercaseProcessor.g.cs | 18 +- .../_Generated/Types/Ingest/Pipeline.g.cs | 2 +- .../Types/Ingest/PipelineProcessor.g.cs | 18 +- .../Types/Ingest/PipelineSimulation.g.cs | 2 +- .../Types/Ingest/ProcessorBase.g.cs | 45 -- .../Types/Ingest/ProcessorContainer.g.cs | 2 +- .../Types/Ingest/RemoveProcessor.g.cs | 18 +- .../Types/Ingest/RenameProcessor.g.cs | 18 +- .../_Generated/Types/Ingest/SetProcessor.g.cs | 18 +- .../Ingest/SetSecurityUserProcessor.g.cs | 18 +- .../Types/Ingest/SortProcessor.g.cs | 18 +- .../Types/Ingest/SplitProcessor.g.cs | 18 +- .../Types/Ingest/TrimProcessor.g.cs | 18 +- .../Types/Ingest/UppercaseProcessor.g.cs | 18 +- .../Types/Ingest/UrlDecodeProcessor.g.cs | 18 +- .../Types/Ingest/UserAgentProcessor.g.cs | 18 +- .../_Generated/Types/InlineGet.g.cs | 2 +- .../_Generated/Types/InlineScript.g.cs | 8 +- .../_Generated/Types/InnerHits.g.cs | 2 +- .../_Generated/Types/InnerHitsResult.g.cs | 2 +- .../_Generated/Types/LanguageContext.g.cs | 2 +- .../Types/LaplaceSmoothingModel.g.cs | 2 +- .../_Generated/Types/LatLonGeoLocation.g.cs | 2 +- .../Types/License/Acknowledgement.g.cs | 2 +- .../_Generated/Types/License/License.g.cs | 2 +- .../Types/License/LicenseInformation.g.cs | 2 +- .../LinearInterpolationSmoothingModel.g.cs | 2 +- .../AggregateMetricDoubleProperty.g.cs | 26 +- .../_Generated/Types/Mapping/AllField.g.cs | 2 +- .../Types/Mapping/BinaryProperty.g.cs | 42 +- .../Types/Mapping/BooleanProperty.g.cs | 42 +- .../Types/Mapping/ByteNumberProperty.g.cs | 238 +++--- .../Types/Mapping/CompletionProperty.g.cs | 42 +- .../Mapping/ConstantKeywordProperty.g.cs | 26 +- .../Types/Mapping/CorePropertyBase.g.cs | 41 - .../Types/Mapping/DataStreamTimestamp.g.cs | 2 +- .../Types/Mapping/DateNanosProperty.g.cs | 42 +- .../Types/Mapping/DateProperty.g.cs | 42 +- .../Types/Mapping/DateRangeProperty.g.cs | 54 +- .../Mapping/DenseVectorIndexOptions.g.cs | 2 +- .../Types/Mapping/DenseVectorProperty.g.cs | 26 +- .../Types/Mapping/DocValuesPropertyBase.g.cs | 33 - .../Types/Mapping/DoubleNumberProperty.g.cs | 238 +++--- .../Types/Mapping/DoubleRangeProperty.g.cs | 54 +- .../Types/Mapping/DynamicProperty.g.cs | 216 ++--- .../Types/Mapping/DynamicTemplate.g.cs | 2 +- .../Types/Mapping/FieldAliasProperty.g.cs | 26 +- .../Types/Mapping/FieldNamesField.g.cs | 2 +- .../Types/Mapping/FlattenedProperty.g.cs | 26 +- .../Types/Mapping/FloatNumberProperty.g.cs | 238 +++--- .../Types/Mapping/FloatRangeProperty.g.cs | 54 +- .../Types/Mapping/GeoPointProperty.g.cs | 42 +- .../Types/Mapping/GeoShapeProperty.g.cs | 42 +- .../Mapping/HalfFloatNumberProperty.g.cs | 238 +++--- .../Types/Mapping/HistogramProperty.g.cs | 26 +- .../_Generated/Types/Mapping/IndexField.g.cs | 2 +- .../Types/Mapping/IntegerNumberProperty.g.cs | 238 +++--- .../Types/Mapping/IntegerRangeProperty.g.cs | 54 +- .../_Generated/Types/Mapping/IpProperty.g.cs | 42 +- .../Types/Mapping/IpRangeProperty.g.cs | 54 +- .../Types/Mapping/JoinProperty.g.cs | 26 +- .../Types/Mapping/KeywordProperty.g.cs | 42 +- .../Types/Mapping/LongNumberProperty.g.cs | 238 +++--- .../Types/Mapping/LongRangeProperty.g.cs | 54 +- .../Types/Mapping/MatchOnlyTextProperty.g.cs | 2 +- .../Types/Mapping/Murmur3HashProperty.g.cs | 42 +- .../Types/Mapping/NestedProperty.g.cs | 38 +- .../Types/Mapping/NumberPropertyBase.g.cs | 41 - .../Types/Mapping/ObjectProperty.g.cs | 38 +- .../Types/Mapping/PercolatorProperty.g.cs | 26 +- .../Types/Mapping/PointProperty.g.cs | 42 +- .../Types/Mapping/PropertyBase.g.cs | 53 -- .../Types/Mapping/RangePropertyBase.g.cs | 41 - .../Types/Mapping/RankFeatureProperty.g.cs | 26 +- .../Types/Mapping/RankFeaturesProperty.g.cs | 26 +- .../Types/Mapping/RoutingField.g.cs | 2 +- .../Types/Mapping/RuntimeField.g.cs | 42 +- .../Mapping/ScaledFloatNumberProperty.g.cs | 54 +- .../Mapping/SearchAsYouTypeProperty.g.cs | 38 +- .../Types/Mapping/ShapeProperty.g.cs | 42 +- .../Types/Mapping/ShortNumberProperty.g.cs | 238 +++--- .../_Generated/Types/Mapping/SizeField.g.cs | 2 +- .../_Generated/Types/Mapping/SourceField.g.cs | 2 +- .../Types/Mapping/StandardNumberProperty.g.cs | 655 --------------- .../Types/Mapping/SuggestContext.g.cs | 2 +- .../Types/Mapping/TextIndexPrefixes.g.cs | 2 +- .../Types/Mapping/TextProperty.g.cs | 38 +- .../Types/Mapping/TokenCountProperty.g.cs | 42 +- .../_Generated/Types/Mapping/TypeMapping.g.cs | 2 +- .../Mapping/UnsignedLongNumberProperty.g.cs | 54 +- .../Types/Mapping/VersionProperty.g.cs | 42 +- .../Types/Mapping/WildcardProperty.g.cs | 42 +- .../_Generated/Types/MergesStats.g.cs | 2 +- .../Types/Migration/Deprecation.g.cs | 2 +- .../Types/Migration/MigrationFeature.g.cs | 2 +- .../Migration/MigrationFeatureIndexInfo.g.cs | 2 +- .../_Generated/Types/Ml/AggregateOutput.g.cs | 2 +- .../_Generated/Types/Ml/AnalysisConfig.g.cs | 2 +- .../Types/Ml/AnalysisConfigRead.g.cs | 2 +- .../_Generated/Types/Ml/AnalysisLimits.g.cs | 2 +- .../Types/Ml/AnalysisMemoryLimit.g.cs | 2 +- .../_Generated/Types/Ml/Anomaly.g.cs | 2 +- .../_Generated/Types/Ml/AnomalyCause.g.cs | 2 +- .../_Generated/Types/Ml/AnomalyDetectors.g.cs | 2 +- .../Types/Ml/ApiKeyAuthorization.g.cs | 2 +- .../_Generated/Types/Ml/Calendar.g.cs | 2 +- .../_Generated/Types/Ml/CalendarEvent.g.cs | 2 +- .../Ml/CategorizationAnalyzerDefinition.g.cs | 2 +- .../_Generated/Types/Ml/ChunkingConfig.g.cs | 2 +- .../Ml/ClassificationInferenceOptions.g.cs | 2 +- .../Types/Ml/ConfusionMatrixItem.g.cs | 2 +- .../Types/Ml/ConfusionMatrixPrediction.g.cs | 2 +- .../Types/Ml/ConfusionMatrixThreshold.g.cs | 2 +- .../_Generated/Types/Ml/DataCounts.g.cs | 2 +- .../_Generated/Types/Ml/DataDescription.g.cs | 2 +- .../_Generated/Types/Ml/Datafeed.g.cs | 2 +- .../Types/Ml/DatafeedAuthorization.g.cs | 2 +- .../_Generated/Types/Ml/DatafeedConfig.g.cs | 2 +- .../_Generated/Types/Ml/Datafeeds.g.cs | 2 +- .../Types/Ml/DataframeAnalysis.g.cs | 765 ------------------ .../Ml/DataframeAnalysisAnalyzedFields.g.cs | 2 +- .../Ml/DataframeAnalysisClassification.g.cs | 74 +- .../Types/Ml/DataframeAnalysisContainer.g.cs | 2 +- .../Ml/DataframeAnalysisFeatureProcessor.g.cs | 2 +- ...ysisFeatureProcessorFrequencyEncoding.g.cs | 2 +- ...AnalysisFeatureProcessorMultiEncoding.g.cs | 2 +- ...AnalysisFeatureProcessorNGramEncoding.g.cs | 2 +- ...nalysisFeatureProcessorOneHotEncoding.g.cs | 2 +- ...sisFeatureProcessorTargetMeanEncoding.g.cs | 2 +- .../Ml/DataframeAnalysisOutlierDetection.g.cs | 2 +- .../Types/Ml/DataframeAnalysisRegression.g.cs | 74 +- .../Types/Ml/DataframeAnalytics.g.cs | 2 +- .../Ml/DataframeAnalyticsAuthorization.g.cs | 2 +- .../Ml/DataframeAnalyticsDestination.g.cs | 2 +- .../Ml/DataframeAnalyticsFieldSelection.g.cs | 2 +- .../DataframeAnalyticsMemoryEstimation.g.cs | 2 +- .../Types/Ml/DataframeAnalyticsSource.g.cs | 2 +- .../Ml/DataframeAnalyticsStatsDataCounts.g.cs | 2 +- .../DataframeAnalyticsStatsMemoryUsage.g.cs | 2 +- .../Ml/DataframeAnalyticsStatsProgress.g.cs | 2 +- .../Types/Ml/DataframeAnalyticsSummary.g.cs | 2 +- .../Ml/DataframeClassificationSummary.g.cs | 2 +- ...ataframeClassificationSummaryAccuracy.g.cs | 2 +- ...ationSummaryMulticlassConfusionMatrix.g.cs | 2 +- ...taframeClassificationSummaryPrecision.g.cs | 2 +- .../DataframeClassificationSummaryRecall.g.cs | 2 +- .../Types/Ml/DataframeEvaluationClass.g.cs | 6 +- .../Ml/DataframeEvaluationClassification.g.cs | 2 +- ...aframeEvaluationClassificationMetrics.g.cs | 14 +- ...EvaluationClassificationMetricsAucRoc.g.cs | 2 +- .../Ml/DataframeEvaluationContainer.g.cs | 2 +- .../Types/Ml/DataframeEvaluationMetrics.g.cs | 129 --- .../DataframeEvaluationOutlierDetection.g.cs | 2 +- ...rameEvaluationOutlierDetectionMetrics.g.cs | 14 +- .../Ml/DataframeEvaluationRegression.g.cs | 2 +- .../DataframeEvaluationRegressionMetrics.g.cs | 2 +- ...frameEvaluationRegressionMetricsHuber.g.cs | 2 +- ...aframeEvaluationRegressionMetricsMsle.g.cs | 2 +- .../Ml/DataframeEvaluationSummaryAucRoc.g.cs | 6 +- ...frameEvaluationSummaryAucRocCurveItem.g.cs | 2 +- .../Types/Ml/DataframeEvaluationValue.g.cs | 2 +- .../Ml/DataframeOutlierDetectionSummary.g.cs | 2 +- .../Types/Ml/DataframePreviewConfig.g.cs | 186 ++--- .../Types/Ml/DataframeRegressionSummary.g.cs | 2 +- .../_Generated/Types/Ml/Defaults.g.cs | 2 +- .../_Generated/Types/Ml/Definition.g.cs | 2 +- .../Types/Ml/DelayedDataCheckConfig.g.cs | 2 +- .../_Generated/Types/Ml/DetectionRule.g.cs | 2 +- .../_Generated/Types/Ml/Detector.g.cs | 2 +- .../_Generated/Types/Ml/DetectorRead.g.cs | 2 +- .../_Generated/Types/Ml/DiscoveryNode.g.cs | 2 +- .../_Generated/Types/Ml/Ensemble.g.cs | 2 +- .../Types/Ml/FillMaskInferenceOptions.g.cs | 2 +- .../Ml/FillMaskInferenceUpdateOptions.g.cs | 2 +- .../_Generated/Types/Ml/FilterRef.g.cs | 2 +- .../Ml/FrequencyEncodingPreprocessor.g.cs | 2 +- .../_Generated/Types/Ml/Hyperparameter.g.cs | 2 +- .../Ml/InferenceConfigCreateContainer.g.cs | 2 +- .../Ml/InferenceConfigUpdateContainer.g.cs | 2 +- .../_Generated/Types/Ml/Influence.g.cs | 2 +- .../_Generated/Types/Ml/Influencer.g.cs | 2 +- .../_Generated/Types/Ml/Input.g.cs | 2 +- .../_Generated/Types/Ml/Job.g.cs | 2 +- .../_Generated/Types/Ml/JobBlocked.g.cs | 2 +- .../_Generated/Types/Ml/JobConfig.g.cs | 2 +- .../Types/Ml/JobForecastStatistics.g.cs | 2 +- .../_Generated/Types/Ml/JobStatistics.g.cs | 2 +- .../_Generated/Types/Ml/JobStats.g.cs | 2 +- .../_Generated/Types/Ml/JobTimingStats.g.cs | 2 +- .../_Generated/Types/Ml/JvmStats.g.cs | 2 +- .../_Generated/Types/Ml/Limits.g.cs | 2 +- .../_Generated/Types/Ml/MemMlStats.g.cs | 2 +- .../_Generated/Types/Ml/MemStats.g.cs | 2 +- .../_Generated/Types/Ml/Memory.g.cs | 2 +- .../_Generated/Types/Ml/ModelPlotConfig.g.cs | 2 +- .../_Generated/Types/Ml/ModelSizeStats.g.cs | 2 +- .../_Generated/Types/Ml/ModelSnapshot.g.cs | 2 +- .../_Generated/Types/Ml/NativeCode.g.cs | 2 +- .../Types/Ml/NerInferenceOptions.g.cs | 2 +- .../Types/Ml/NerInferenceUpdateOptions.g.cs | 2 +- .../Types/Ml/NlpBertTokenizationConfig.g.cs | 2 +- .../Ml/NlpRobertaTokenizationConfig.g.cs | 2 +- .../Ml/NlpTokenizationUpdateOptions.g.cs | 2 +- .../Types/Ml/OneHotEncodingPreprocessor.g.cs | 2 +- .../_Generated/Types/Ml/OverallBucket.g.cs | 2 +- .../_Generated/Types/Ml/OverallBucketJob.g.cs | 2 +- .../_Generated/Types/Ml/Page.g.cs | 2 +- .../Types/Ml/PassThroughInferenceOptions.g.cs | 2 +- .../Ml/PassThroughInferenceUpdateOptions.g.cs | 2 +- .../Types/Ml/PerPartitionCategorization.g.cs | 2 +- .../_Generated/Types/Ml/Preprocessor.g.cs | 2 +- .../Ml/QuestionAnsweringInferenceOptions.g.cs | 2 +- ...estionAnsweringInferenceUpdateOptions.g.cs | 2 +- .../Types/Ml/RegressionInferenceOptions.g.cs | 2 +- .../_Generated/Types/Ml/RuleCondition.g.cs | 2 +- .../Ml/TargetMeanEncodingPreprocessor.g.cs | 2 +- .../TextClassificationInferenceOptions.g.cs | 2 +- ...tClassificationInferenceUpdateOptions.g.cs | 2 +- .../Ml/TextEmbeddingInferenceOptions.g.cs | 2 +- .../TextEmbeddingInferenceUpdateOptions.g.cs | 2 +- .../Types/Ml/TokenizationConfigContainer.g.cs | 2 +- .../Types/Ml/TotalFeatureImportance.g.cs | 2 +- .../Types/Ml/TotalFeatureImportanceClass.g.cs | 2 +- .../Ml/TotalFeatureImportanceStatistics.g.cs | 2 +- .../_Generated/Types/Ml/TrainedModel.g.cs | 2 +- .../TrainedModelAllocationRoutingTable.g.cs | 2 +- .../Types/Ml/TrainedModelConfigInput.g.cs | 2 +- .../Types/Ml/TrainedModelConfigMetadata.g.cs | 2 +- ...rainedModelDeploymentAllocationStatus.g.cs | 2 +- .../Ml/TrainedModelDeploymentNodesStats.g.cs | 2 +- .../Types/Ml/TrainedModelDeploymentStats.g.cs | 2 +- .../Types/Ml/TrainedModelInferenceStats.g.cs | 2 +- .../Types/Ml/TrainedModelLocation.g.cs | 2 +- .../Types/Ml/TrainedModelLocationIndex.g.cs | 2 +- .../Types/Ml/TrainedModelSizeStats.g.cs | 2 +- .../Types/Ml/TrainedModelStats.g.cs | 2 +- .../_Generated/Types/Ml/TrainedModelTree.g.cs | 2 +- .../Types/Ml/TrainedModelTreeNode.g.cs | 2 +- .../Types/Ml/TransformAuthorization.g.cs | 2 +- .../_Generated/Types/Ml/Weights.g.cs | 2 +- ...eroShotClassificationInferenceOptions.g.cs | 2 +- ...tClassificationInferenceUpdateOptions.g.cs | 2 +- .../_Generated/Types/MultiGetError.g.cs | 2 +- .../_Generated/Types/MultiSearchItem.g.cs | 54 +- .../_Generated/Types/MultisearchBody.g.cs | 2 +- .../_Generated/Types/MultisearchHeader.g.cs | 2 +- .../_Generated/Types/NestedIdentity.g.cs | 2 +- .../_Generated/Types/NestedSortValue.g.cs | 2 +- .../_Generated/Types/NodeAttributes.g.cs | 2 +- .../_Generated/Types/NodeShard.g.cs | 2 +- .../_Generated/Types/NodeStatistics.g.cs | 2 +- .../Types/Nodes/AdaptiveSelection.g.cs | 2 +- .../_Generated/Types/Nodes/Breaker.g.cs | 2 +- .../_Generated/Types/Nodes/Cgroup.g.cs | 2 +- .../_Generated/Types/Nodes/CgroupCpu.g.cs | 2 +- .../_Generated/Types/Nodes/CgroupCpuStat.g.cs | 2 +- .../_Generated/Types/Nodes/CgroupMemory.g.cs | 2 +- .../_Generated/Types/Nodes/Client.g.cs | 2 +- .../Types/Nodes/ClusterAppliedStats.g.cs | 2 +- .../Types/Nodes/ClusterStateQueue.g.cs | 2 +- .../Types/Nodes/ClusterStateUpdate.g.cs | 2 +- .../_Generated/Types/Nodes/Context.g.cs | 2 +- .../_Generated/Types/Nodes/Cpu.g.cs | 2 +- .../_Generated/Types/Nodes/CpuAcct.g.cs | 2 +- .../_Generated/Types/Nodes/DataPathStats.g.cs | 2 +- .../Types/Nodes/DeprecationIndexing.g.cs | 2 +- .../_Generated/Types/Nodes/Discovery.g.cs | 2 +- .../Types/Nodes/ExtendedMemoryStats.g.cs | 42 +- .../_Generated/Types/Nodes/FileSystem.g.cs | 2 +- .../Types/Nodes/FileSystemTotal.g.cs | 2 +- .../Types/Nodes/GarbageCollector.g.cs | 2 +- .../Types/Nodes/GarbageCollectorTotal.g.cs | 2 +- .../_Generated/Types/Nodes/HotThread.g.cs | 2 +- .../_Generated/Types/Nodes/Http.g.cs | 2 +- .../Types/Nodes/IndexingPressure.g.cs | 2 +- .../Types/Nodes/IndexingPressureMemory.g.cs | 2 +- .../_Generated/Types/Nodes/Ingest.g.cs | 2 +- .../_Generated/Types/Nodes/IngestTotal.g.cs | 2 +- .../_Generated/Types/Nodes/IoStatDevice.g.cs | 2 +- .../_Generated/Types/Nodes/IoStats.g.cs | 2 +- .../_Generated/Types/Nodes/Jvm.g.cs | 2 +- .../_Generated/Types/Nodes/JvmClasses.g.cs | 2 +- .../Types/Nodes/JvmMemoryStats.g.cs | 2 +- .../_Generated/Types/Nodes/JvmThreads.g.cs | 2 +- .../Types/Nodes/KeyedProcessor.g.cs | 2 +- .../_Generated/Types/Nodes/MemoryStats.g.cs | 2 +- .../Types/Nodes/NodeBufferPool.g.cs | 2 +- .../_Generated/Types/Nodes/NodeInfo.g.cs | 2 +- .../Types/Nodes/NodeInfoAction.g.cs | 2 +- .../Types/Nodes/NodeInfoBootstrap.g.cs | 2 +- .../Types/Nodes/NodeInfoClient.g.cs | 2 +- .../Types/Nodes/NodeInfoDiscover.g.cs | 2 +- .../_Generated/Types/Nodes/NodeInfoHttp.g.cs | 2 +- .../Types/Nodes/NodeInfoIngest.g.cs | 2 +- .../Types/Nodes/NodeInfoIngestDownloader.g.cs | 2 +- .../Types/Nodes/NodeInfoIngestInfo.g.cs | 2 +- .../Types/Nodes/NodeInfoIngestProcessor.g.cs | 2 +- .../Types/Nodes/NodeInfoJvmMemory.g.cs | 2 +- .../Types/Nodes/NodeInfoMemory.g.cs | 2 +- .../Types/Nodes/NodeInfoNetwork.g.cs | 2 +- .../Types/Nodes/NodeInfoNetworkInterface.g.cs | 2 +- .../_Generated/Types/Nodes/NodeInfoOSCPU.g.cs | 2 +- .../_Generated/Types/Nodes/NodeInfoPath.g.cs | 2 +- .../Types/Nodes/NodeInfoRepositories.g.cs | 2 +- .../Types/Nodes/NodeInfoRepositoriesUrl.g.cs | 2 +- .../Types/Nodes/NodeInfoScript.g.cs | 2 +- .../Types/Nodes/NodeInfoSearch.g.cs | 2 +- .../Types/Nodes/NodeInfoSearchRemote.g.cs | 2 +- .../Types/Nodes/NodeInfoSettings.g.cs | 2 +- .../Types/Nodes/NodeInfoSettingsCluster.g.cs | 2 +- .../NodeInfoSettingsClusterElection.g.cs | 2 +- .../Types/Nodes/NodeInfoSettingsHttp.g.cs | 2 +- .../Types/Nodes/NodeInfoSettingsHttpType.g.cs | 2 +- .../Types/Nodes/NodeInfoSettingsIngest.g.cs | 2 +- .../Types/Nodes/NodeInfoSettingsNetwork.g.cs | 2 +- .../Types/Nodes/NodeInfoSettingsNode.g.cs | 2 +- .../Nodes/NodeInfoSettingsTransport.g.cs | 2 +- .../NodeInfoSettingsTransportFeatures.g.cs | 2 +- .../Nodes/NodeInfoSettingsTransportType.g.cs | 2 +- .../Types/Nodes/NodeInfoTransport.g.cs | 2 +- .../_Generated/Types/Nodes/NodeInfoXpack.g.cs | 2 +- .../Types/Nodes/NodeInfoXpackLicense.g.cs | 2 +- .../Types/Nodes/NodeInfoXpackLicenseType.g.cs | 2 +- .../Types/Nodes/NodeInfoXpackSecurity.g.cs | 2 +- .../Nodes/NodeInfoXpackSecurityAuthc.g.cs | 2 +- .../NodeInfoXpackSecurityAuthcRealms.g.cs | 2 +- ...odeInfoXpackSecurityAuthcRealmsStatus.g.cs | 2 +- .../NodeInfoXpackSecurityAuthcToken.g.cs | 2 +- .../Types/Nodes/NodeInfoXpackSecuritySsl.g.cs | 2 +- .../_Generated/Types/Nodes/NodeJvmInfo.g.cs | 2 +- .../Types/Nodes/NodeOperatingSystemInfo.g.cs | 2 +- .../Types/Nodes/NodeProcessInfo.g.cs | 2 +- .../Types/Nodes/NodeReloadError.g.cs | 2 +- .../Types/Nodes/NodeThreadPoolInfo.g.cs | 2 +- .../_Generated/Types/Nodes/NodeUsage.g.cs | 2 +- .../Types/Nodes/OperatingSystem.g.cs | 2 +- .../_Generated/Types/Nodes/Pool.g.cs | 2 +- .../Types/Nodes/PressureMemory.g.cs | 2 +- .../_Generated/Types/Nodes/Process.g.cs | 2 +- .../_Generated/Types/Nodes/Processor.g.cs | 2 +- .../Types/Nodes/PublishedClusterStates.g.cs | 2 +- .../_Generated/Types/Nodes/Recording.g.cs | 2 +- .../_Generated/Types/Nodes/ScriptCache.g.cs | 2 +- .../_Generated/Types/Nodes/Scripting.g.cs | 2 +- .../Types/Nodes/SerializedClusterState.g.cs | 2 +- .../Nodes/SerializedClusterStateDetail.g.cs | 2 +- .../_Generated/Types/Nodes/Stats.g.cs | 2 +- .../_Generated/Types/Nodes/ThreadCount.g.cs | 2 +- .../_Generated/Types/Nodes/Transport.g.cs | 2 +- .../Types/Nodes/TransportHistogram.g.cs | 2 +- .../_Generated/Types/Operation.g.cs | 2 +- .../Types/PhraseSuggestCollate.g.cs | 2 +- .../Types/PhraseSuggestCollateQuery.g.cs | 2 +- .../Types/PhraseSuggestHighlight.g.cs | 2 +- .../_Generated/Types/PhraseSuggester.g.cs | 14 +- .../_Generated/Types/PluginStats.g.cs | 2 +- .../Types/PointInTimeReference.g.cs | 4 +- .../_Generated/Types/Profile.g.cs | 2 +- .../_Generated/Types/QueryBreakdown.g.cs | 2 +- .../_Generated/Types/QueryCacheStats.g.cs | 2 +- .../_Generated/Types/QueryDsl/BoolQuery.g.cs | 10 +- .../Types/QueryDsl/BoostingQuery.g.cs | 10 +- .../Types/QueryDsl/CombinedFieldsQuery.g.cs | 10 +- .../Types/QueryDsl/ConstantScoreQuery.g.cs | 10 +- .../Types/QueryDsl/DateRangeQuery.g.cs | 178 ++-- .../Types/QueryDsl/DisMaxQuery.g.cs | 10 +- .../Types/QueryDsl/ExistsQuery.g.cs | 10 +- .../Types/QueryDsl/FieldAndFormat.g.cs | 2 +- .../Types/QueryDsl/FieldLookup.g.cs | 2 +- .../FieldValueFactorScoreFunction.g.cs | 2 +- .../QueryDsl/FunctionScoreContainer.g.cs | 2 +- .../Types/QueryDsl/FunctionScoreQuery.g.cs | 10 +- .../_Generated/Types/QueryDsl/FuzzyQuery.g.cs | 132 +-- .../Types/QueryDsl/GeoBoundingBoxQuery.g.cs | 46 +- .../Types/QueryDsl/GeoDistanceQuery.g.cs | 50 +- .../Types/QueryDsl/GeoPolygonPoints.g.cs | 2 +- .../Types/QueryDsl/GeoPolygonQuery.g.cs | 46 +- .../Types/QueryDsl/GeoShapeFieldQuery.g.cs | 2 +- .../Types/QueryDsl/GeoShapeQuery.g.cs | 30 +- .../Types/QueryDsl/HasChildQuery.g.cs | 10 +- .../Types/QueryDsl/HasParentQuery.g.cs | 10 +- .../_Generated/Types/QueryDsl/IdsQuery.g.cs | 10 +- .../Types/QueryDsl/IntervalsAllOf.g.cs | 2 +- .../Types/QueryDsl/IntervalsAnyOf.g.cs | 2 +- .../Types/QueryDsl/IntervalsContainer.g.cs | 2 +- .../Types/QueryDsl/IntervalsFilter.g.cs | 2 +- .../Types/QueryDsl/IntervalsFuzzy.g.cs | 2 +- .../Types/QueryDsl/IntervalsMatch.g.cs | 2 +- .../Types/QueryDsl/IntervalsPrefix.g.cs | 2 +- .../Types/QueryDsl/IntervalsQuery.g.cs | 13 +- .../Types/QueryDsl/IntervalsWildcard.g.cs | 2 +- .../_Generated/Types/QueryDsl/KnnQuery.g.cs | 10 +- .../Types/QueryDsl/LikeDocument.g.cs | 2 +- .../Types/QueryDsl/MatchAllQuery.g.cs | 9 +- .../Types/QueryDsl/MatchBoolPrefixQuery.g.cs | 162 ++-- .../Types/QueryDsl/MatchNoneQuery.g.cs | 9 +- .../QueryDsl/MatchPhrasePrefixQuery.g.cs | 122 +-- .../Types/QueryDsl/MatchPhraseQuery.g.cs | 112 ++- .../_Generated/Types/QueryDsl/MatchQuery.g.cs | 192 +++-- .../Types/QueryDsl/MoreLikeThisQuery.g.cs | 10 +- .../Types/QueryDsl/MultiMatchQuery.g.cs | 10 +- .../Types/QueryDsl/NestedQuery.g.cs | 10 +- .../Types/QueryDsl/NumberRangeQuery.g.cs | 154 ++-- .../Types/QueryDsl/ParentIdQuery.g.cs | 10 +- .../Types/QueryDsl/PercolateQuery.g.cs | 10 +- .../Types/QueryDsl/PinnedQuery.g.cs | 10 +- .../Types/QueryDsl/PrefixQuery.g.cs | 98 ++- .../_Generated/Types/QueryDsl/QueryBase.g.cs | 37 - .../Types/QueryDsl/QueryContainer.g.cs | 2 +- .../Types/QueryDsl/QueryStringQuery.g.cs | 10 +- .../Types/QueryDsl/RandomScoreFunction.g.cs | 2 +- .../Types/QueryDsl/RangeQueryBase.g.cs | 33 - .../Types/QueryDsl/RankFeatureFunction.g.cs | 42 - .../QueryDsl/RankFeatureFunctionLinear.g.cs | 2 +- .../RankFeatureFunctionLogarithm.g.cs | 2 +- .../RankFeatureFunctionSaturation.g.cs | 2 +- .../QueryDsl/RankFeatureFunctionSigmoid.g.cs | 2 +- .../Types/QueryDsl/RankFeatureQuery.g.cs | 10 +- .../Types/QueryDsl/RegexpQuery.g.cs | 122 +-- .../Types/QueryDsl/ScriptQuery.g.cs | 56 +- .../Types/QueryDsl/ScriptScoreFunction.g.cs | 48 +- .../Types/QueryDsl/ScriptScoreQuery.g.cs | 124 +-- .../Types/QueryDsl/ShapeFieldQuery.g.cs | 2 +- .../_Generated/Types/QueryDsl/ShapeQuery.g.cs | 30 +- .../QueryDsl/SimpleQueryStringQuery.g.cs | 10 +- .../Types/QueryDsl/SpanContainingQuery.g.cs | 10 +- .../Types/QueryDsl/SpanFieldMaskingQuery.g.cs | 10 +- .../Types/QueryDsl/SpanFirstQuery.g.cs | 10 +- .../Types/QueryDsl/SpanMultiTermQuery.g.cs | 10 +- .../Types/QueryDsl/SpanNearQuery.g.cs | 10 +- .../Types/QueryDsl/SpanNotQuery.g.cs | 10 +- .../Types/QueryDsl/SpanOrQuery.g.cs | 10 +- .../_Generated/Types/QueryDsl/SpanQuery.g.cs | 2 +- .../Types/QueryDsl/SpanTermQuery.g.cs | 70 +- .../Types/QueryDsl/SpanWithinQuery.g.cs | 10 +- .../_Generated/Types/QueryDsl/TermQuery.g.cs | 84 +- .../Types/QueryDsl/TermsLookup.g.cs | 2 +- .../_Generated/Types/QueryDsl/TermsQuery.g.cs | 6 +- .../Types/QueryDsl/TermsSetQuery.g.cs | 220 +++-- .../Types/QueryDsl/WildcardQuery.g.cs | 118 +-- .../Types/QueryDsl/WrapperQuery.g.cs | 10 +- .../_Generated/Types/QueryProfile.g.cs | 2 +- .../_Generated/Types/RankEvalHit.g.cs | 2 +- .../_Generated/Types/RankEvalHitItem.g.cs | 2 +- .../_Generated/Types/RankEvalMetric.g.cs | 2 +- .../_Generated/Types/RankEvalMetricBase.g.cs | 33 - .../Types/RankEvalMetricDetail.g.cs | 2 +- ...ankEvalMetricDiscountedCumulativeGain.g.cs | 6 +- .../RankEvalMetricExpectedReciprocalRank.g.cs | 6 +- .../RankEvalMetricMeanReciprocalRank.g.cs | 9 +- .../Types/RankEvalMetricPrecision.g.cs | 10 +- .../Types/RankEvalMetricRatingTreshold.g.cs | 75 -- .../Types/RankEvalMetricRecall.g.cs | 9 +- .../_Generated/Types/RankEvalQuery.g.cs | 2 +- .../_Generated/Types/RankEvalRequestItem.g.cs | 2 +- .../_Generated/Types/RecoveryStats.g.cs | 2 +- .../_Generated/Types/RefreshStats.g.cs | 2 +- .../_Generated/Types/ReindexNode.g.cs | 26 +- .../_Generated/Types/ReindexStatus.g.cs | 2 +- .../_Generated/Types/ReindexTask.g.cs | 2 +- .../_Generated/Types/RemoteSource.g.cs | 2 +- .../_Generated/Types/RequestBase.g.cs | 30 - .../_Generated/Types/RequestCacheStats.g.cs | 2 +- .../_Generated/Types/Rescore.g.cs | 2 +- .../_Generated/Types/RescoreQuery.g.cs | 2 +- .../_Generated/Types/ResponseBody.g.cs | 81 -- .../_Generated/Types/Retries.g.cs | 2 +- .../_Generated/Types/ScoreSort.g.cs | 2 +- .../Types/{SuggesterBase.g.cs => Script.g.cs} | 19 +- .../_Generated/Types/ScriptBase.g.cs | 33 - .../_Generated/Types/ScriptField.g.cs | 48 +- .../_Generated/Types/ScriptSort.g.cs | 116 +-- .../_Generated/Types/SearchProfile.g.cs | 2 +- .../_Generated/Types/SearchStats.g.cs | 2 +- .../SearchableSnapshots/MountedSnapshot.g.cs | 2 +- .../_Generated/Types/Security/ApiKey.g.cs | 2 +- .../Security/ApplicationPrivilegesCheck.g.cs | 2 +- .../Types/Security/AuthenticatedUser.g.cs | 26 +- .../Security/AuthenticationProvider.g.cs | 2 +- .../Types/Security/ClusterNode.g.cs | 2 +- .../Types/Security/GrantApiKey.g.cs | 2 +- .../Types/Security/IndexPrivilegesCheck.g.cs | 2 +- .../_Generated/Types/Security/RealmInfo.g.cs | 2 +- .../_Generated/Types/Security/Token.g.cs | 2 +- .../_Generated/Types/Security/User.g.cs | 53 -- .../_Generated/Types/Security/UserRealm.g.cs | 2 +- .../_Generated/Types/SegmentsStats.g.cs | 2 +- .../_Generated/Types/ShardFailure.g.cs | 2 +- .../_Generated/Types/ShardProfile.g.cs | 2 +- .../_Generated/Types/ShardStatistics.g.cs | 2 +- .../_Generated/Types/ShardStoreIndex.g.cs | 2 +- .../_Generated/Types/SlicedScroll.g.cs | 2 +- .../_Generated/Types/Slm/Configuration.g.cs | 2 +- .../_Generated/Types/Slm/Retention.g.cs | 2 +- .../_Generated/Types/Slm/Statistics.g.cs | 2 +- .../Types/SmoothingModelContainer.g.cs | 2 +- .../Snapshot/CleanupRepositoryResults.g.cs | 2 +- .../Types/Snapshot/CompactNodeInfo.g.cs | 2 +- .../Snapshot/FileCountSnapshotStats.g.cs | 2 +- .../Types/Snapshot/IndexDetails.g.cs | 2 +- .../Types/Snapshot/InfoFeatureState.g.cs | 2 +- .../Types/Snapshot/RepositorySettings.g.cs | 2 +- .../Types/Snapshot/ShardsStats.g.cs | 2 +- .../Types/Snapshot/ShardsStatsSummary.g.cs | 2 +- .../Snapshot/ShardsStatsSummaryItem.g.cs | 2 +- .../Types/Snapshot/SnapshotIndexStats.g.cs | 2 +- .../Types/Snapshot/SnapshotInfo.g.cs | 2 +- .../Types/Snapshot/SnapshotResponseItem.g.cs | 2 +- .../Types/Snapshot/SnapshotRestore.g.cs | 2 +- .../Types/Snapshot/SnapshotShardFailure.g.cs | 2 +- .../Types/Snapshot/SnapshotShardsStatus.g.cs | 2 +- .../Types/Snapshot/SnapshotStats.g.cs | 2 +- .../_Generated/Types/Snapshot/Status.g.cs | 2 +- .../_Generated/Types/SortOptions.g.cs | 2 +- .../_Generated/Types/Source.g.cs | 2 +- .../_Generated/Types/SourceFilter.g.cs | 2 +- .../_Generated/Types/SpecUtils/BaseNode.g.cs | 53 -- .../_Generated/Types/Sql/Column.g.cs | 2 +- .../_Generated/Types/StoreStats.g.cs | 2 +- .../_Generated/Types/StoredScript.g.cs | 2 +- .../_Generated/Types/StoredScriptId.g.cs | 8 +- .../Types/StupidBackoffSmoothingModel.g.cs | 2 +- .../_Generated/Types/SuggestFuzziness.g.cs | 2 +- .../_Generated/Types/Suggester.g.cs | 2 +- .../_Generated/Types/TaskFailure.g.cs | 2 +- .../_Generated/Types/Tasks/NodeTasks.g.cs | 2 +- .../Types/Tasks/ParentTaskInfo.g.cs | 50 +- .../_Generated/Types/Tasks/TaskInfo.g.cs | 2 +- .../_Generated/Types/Tasks/TaskStatus.g.cs | 2 +- .../_Generated/Types/TermSuggester.g.cs | 14 +- .../Types/TopLeftBottomRightGeoBounds.g.cs | 2 +- .../Types/TopRightBottomLeftGeoBounds.g.cs | 2 +- .../_Generated/Types/TotalHits.g.cs | 2 +- .../TransformManagement/CheckpointStats.g.cs | 2 +- .../TransformManagement/Checkpointing.g.cs | 2 +- .../TransformManagement/Destination.g.cs | 2 +- .../Types/TransformManagement/Latest.g.cs | 2 +- .../Types/TransformManagement/Pivot.g.cs | 2 +- .../PivotGroupByContainer.g.cs | 2 +- .../TransformManagement/RetentionPolicy.g.cs | 2 +- .../RetentionPolicyContainer.g.cs | 2 +- .../Types/TransformManagement/Settings.g.cs | 2 +- .../Types/TransformManagement/Source.g.cs | 2 +- .../TransformManagement/SyncContainer.g.cs | 2 +- .../Types/TransformManagement/TimeSync.g.cs | 2 +- .../TransformIndexerStats.g.cs | 2 +- .../TransformProgress.g.cs | 2 +- .../TransformManagement/TransformStats.g.cs | 2 +- .../TransformManagement/TransformSummary.g.cs | 2 +- .../_Generated/Types/TranslogStats.g.cs | 2 +- .../_Generated/Types/UnratedDocument.g.cs | 2 +- .../Types/UpdateByQueryRethrottleNode.g.cs | 26 +- .../_Generated/Types/WarmerStats.g.cs | 2 +- .../_Generated/Types/WktGeoBounds.g.cs | 2 +- .../_Generated/Types/Xpack/AllJobs.g.cs | 2 +- .../_Generated/Types/Xpack/Analytics.g.cs | 10 +- .../Types/Xpack/AnalyticsStatistics.g.cs | 2 +- .../_Generated/Types/Xpack/Archive.g.cs | 10 +- .../_Generated/Types/Xpack/Audit.g.cs | 6 +- .../Types/Xpack/BuildInformation.g.cs | 2 +- .../_Generated/Types/Xpack/Ccr.g.cs | 10 +- .../_Generated/Types/Xpack/Counter.g.cs | 2 +- .../_Generated/Types/Xpack/DataStreams.g.cs | 10 +- .../Types/Xpack/DataTierPhaseStatistics.g.cs | 2 +- .../_Generated/Types/Xpack/DataTiers.g.cs | 10 +- .../_Generated/Types/Xpack/Datafeed.g.cs | 2 +- .../_Generated/Types/Xpack/Eql.g.cs | 10 +- .../_Generated/Types/Xpack/EqlFeatures.g.cs | 2 +- .../Types/Xpack/EqlFeaturesJoin.g.cs | 2 +- .../Types/Xpack/EqlFeaturesKeys.g.cs | 2 +- .../Types/Xpack/EqlFeaturesPipes.g.cs | 2 +- .../Types/Xpack/EqlFeaturesSequences.g.cs | 2 +- .../_Generated/Types/Xpack/Feature.g.cs | 2 +- .../_Generated/Types/Xpack/FeatureToggle.g.cs | 2 +- .../_Generated/Types/Xpack/Features.g.cs | 2 +- .../_Generated/Types/Xpack/Flattened.g.cs | 10 +- .../_Generated/Types/Xpack/FrozenIndices.g.cs | 10 +- .../_Generated/Types/Xpack/Ilm.g.cs | 2 +- .../Types/Xpack/IlmPolicyStatistics.g.cs | 2 +- .../_Generated/Types/Xpack/IpFilter.g.cs | 2 +- .../_Generated/Types/Xpack/Jobs.g.cs | 2 +- .../Types/Xpack/MachineLearning.g.cs | 10 +- .../Xpack/MinimalLicenseInformation.g.cs | 2 +- .../_Generated/Types/Xpack/MlCounter.g.cs | 2 +- .../Types/Xpack/MlDataFrameAnalyticsJobs.g.cs | 2 +- .../MlDataFrameAnalyticsJobsAnalysis.g.cs | 2 +- .../Xpack/MlDataFrameAnalyticsJobsCount.g.cs | 2 +- .../Xpack/MlDataFrameAnalyticsJobsMemory.g.cs | 2 +- .../_Generated/Types/Xpack/MlInference.g.cs | 2 +- .../Types/Xpack/MlInferenceDeployments.g.cs | 2 +- .../Xpack/MlInferenceDeploymentsTimeMs.g.cs | 2 +- .../Xpack/MlInferenceIngestProcessor.g.cs | 2 +- .../MlInferenceIngestProcessorCount.g.cs | 2 +- .../Types/Xpack/MlInferenceTrainedModels.g.cs | 2 +- .../Xpack/MlInferenceTrainedModelsCount.g.cs | 2 +- .../_Generated/Types/Xpack/Monitoring.g.cs | 10 +- .../Types/Xpack/NativeCodeInformation.g.cs | 2 +- .../_Generated/Types/Xpack/Query.g.cs | 2 +- .../_Generated/Types/Xpack/Realm.g.cs | 10 +- .../_Generated/Types/Xpack/RealmCache.g.cs | 2 +- .../_Generated/Types/Xpack/RoleMapping.g.cs | 2 +- .../Types/Xpack/RuntimeFieldTypes.g.cs | 10 +- .../Types/Xpack/RuntimeFieldsType.g.cs | 2 +- .../Types/Xpack/SearchableSnapshots.g.cs | 10 +- .../_Generated/Types/Xpack/Security.g.cs | 10 +- .../_Generated/Types/Xpack/SecurityRoles.g.cs | 2 +- .../Types/Xpack/SecurityRolesDls.g.cs | 2 +- .../Xpack/SecurityRolesDlsBitSetCache.g.cs | 2 +- .../Types/Xpack/SecurityRolesFile.g.cs | 2 +- .../Types/Xpack/SecurityRolesNative.g.cs | 2 +- .../_Generated/Types/Xpack/Slm.g.cs | 10 +- .../_Generated/Types/Xpack/Sql.g.cs | 10 +- .../_Generated/Types/Xpack/Ssl.g.cs | 2 +- .../_Generated/Types/Xpack/Vector.g.cs | 10 +- .../_Generated/Types/Xpack/Watcher.g.cs | 10 +- .../Types/Xpack/WatcherActionTotals.g.cs | 2 +- .../Types/Xpack/WatcherActions.g.cs | 2 +- .../_Generated/Types/Xpack/WatcherWatch.g.cs | 2 +- .../Types/Xpack/WatcherWatchTrigger.g.cs | 2 +- .../Xpack/WatcherWatchTriggerSchedule.g.cs | 10 +- .../DateHistogramAggregationUsageTests.cs | 216 ++--- .../Bucket/TermsAggregationUsageTests.cs | 13 +- .../Metric/AverageAggregationUsageTests.cs | 5 +- .../WeightedAverageAggregationUsageTests.cs | 4 +- .../Document/Multiple/Bulk/BulkApiTests.cs | 4 +- .../Multiple/Bulk/BulkUpdateManyTests.cs | 2 +- tests/Tests/Search/Search/SearchApiTests.cs | 2 +- .../AverageAggregationSerializationTests.cs | 2 +- .../BucketSubAggregationSerializationTests.cs | 6 +- .../TermsAggregateDeserializationTests.cs | 60 +- ...lkOperationCollectionSerializationTests.cs | 16 +- .../ScriptParamsSerializationTests.cs | 31 +- .../Scripting/ScriptSerialisationTests.cs | 22 +- tests/Tests/Tests.csproj | 3 +- ...zerForScriptParameters_IsTrue.verified.txt | 5 +- tests/Tests/xunit.runner.json | 5 + 1452 files changed, 9514 insertions(+), 13050 deletions(-) create mode 100644 src/Elastic.Clients.Elasticsearch/Common/Aggregations/Aggregate.cs create mode 100644 src/Elastic.Clients.Elasticsearch/Common/Aggregations/Aggregation.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationBase.cs rename src/Elastic.Clients.Elasticsearch/Common/Query/{QueryBase.cs => Query.cs} (88%) delete mode 100644 src/Elastic.Clients.Elasticsearch/Serialization/FieldNameQueryConverterBase.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/Types/Aggregations/MultiBucketAggregateBase.cs create mode 100644 src/Elastic.Clients.Elasticsearch/Types/MultiSearchItem.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/Types/Scripting/InlineScriptDescriptor.cs create mode 100644 src/Elastic.Clients.Elasticsearch/Types/Scripting/Script.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/Types/Scripting/ScriptDescriptor.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregateBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketAggregationBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketPathAggregationBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FormatMetricAggregationBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FormattableMetricAggregationBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixAggregationBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MetricAggregationBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiBucketAggregateBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiBucketBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesAggregateBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PipelineAggregationBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SingleBucketAggregateBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SingleMetricAggregateBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregateBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsBucketBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharFilterBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CompoundWordTokenFilterBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TokenFilterBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TokenizerBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/HighlightBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ProcessorBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/CorePropertyBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DocValuesPropertyBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/NumberPropertyBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PropertyBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RangePropertyBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/StandardNumberProperty.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DataframeAnalysis.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DataframeEvaluationMetrics.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RangeQueryBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunction.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/RankEvalMetricBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/RankEvalMetricRatingTreshold.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/RequestBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/ResponseBody.g.cs rename src/Elastic.Clients.Elasticsearch/_Generated/Types/{SuggesterBase.g.cs => Script.g.cs} (79%) delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptBase.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/User.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/SpecUtils/BaseNode.g.cs create mode 100644 tests/Tests/xunit.runner.json diff --git a/src/Elastic.Clients.Elasticsearch/Api/BulkRequest.cs b/src/Elastic.Clients.Elasticsearch/Api/BulkRequest.cs index 40425b6d939..11d00fce89b 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/BulkRequest.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/BulkRequest.cs @@ -13,7 +13,7 @@ namespace Elastic.Clients.Elasticsearch { public partial class BulkRequest : IStreamSerializable { - protected IRequest Self => this; + internal IRequest Self => this; public BulkOperationsCollection Operations { get; set; } diff --git a/src/Elastic.Clients.Elasticsearch/Api/CountRequest.cs b/src/Elastic.Clients.Elasticsearch/Api/CountRequest.cs index 6c34cf2a24e..82b78f99fac 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/CountRequest.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/CountRequest.cs @@ -7,7 +7,7 @@ namespace Elastic.Clients.Elasticsearch { - public partial class CountRequest : CountRequest + public sealed partial class CountRequest : CountRequest { //protected CountRequest TypedSelf => this; diff --git a/src/Elastic.Clients.Elasticsearch/Common/Aggregations/Aggregate.cs b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/Aggregate.cs new file mode 100644 index 00000000000..ffcd45a097a --- /dev/null +++ b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/Aggregate.cs @@ -0,0 +1,16 @@ +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information. + +namespace Elastic.Clients.Elasticsearch.Aggregations; + +public interface IAggregate { } + +/// +/// Base class for all aggregates. +/// +public abstract class Aggregate : IAggregate +{ +} + + diff --git a/src/Elastic.Clients.Elasticsearch/Common/Aggregations/Aggregation.cs b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/Aggregation.cs new file mode 100644 index 00000000000..881ed8d2f20 --- /dev/null +++ b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/Aggregation.cs @@ -0,0 +1,27 @@ +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information. + +namespace Elastic.Clients.Elasticsearch.Aggregations; + +public interface IAggregation +{ + string? Name { get; } +} + +/// +/// Base class for all aggregations. +/// +public abstract class Aggregation : IAggregation +{ + public abstract string? Name { get; internal set; } + + //always evaluate to false so that each side of && equation is evaluated + public static bool operator false(Aggregation _) => false; + + //always evaluate to false so that each side of && equation is evaluated + public static bool operator true(Aggregation _) => false; + + public static Aggregation operator &(Aggregation left, Aggregation right) => + new AggregationCombinator(null, left, right); +} diff --git a/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationBase.cs b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationBase.cs deleted file mode 100644 index dc34f382b84..00000000000 --- a/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationBase.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Licensed to Elasticsearch B.V under one or more agreements. -// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information. - -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Elastic.Clients.Elasticsearch.Aggregations; - -public abstract class AggregationBase -{ - internal AggregationBase(string name) => Name = name; - - /// - /// Custom metadata associated with the aggregation. - /// - [JsonIgnore] - public Dictionary? Meta { get; set; } - - /// - /// The name for this aggregation. - /// - [JsonIgnore] - public string? Name { get; internal set; } - - //always evaluate to false so that each side of && equation is evaluated - public static bool operator false(AggregationBase _) => false; - - //always evaluate to false so that each side of && equation is evaluated - public static bool operator true(AggregationBase _) => false; - - public static AggregationBase operator &(AggregationBase left, AggregationBase right) => - new AggregationCombinator(null, left, right); -} diff --git a/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationCombinator.cs b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationCombinator.cs index 50974da236b..01341e4f32e 100644 --- a/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationCombinator.cs +++ b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationCombinator.cs @@ -10,19 +10,20 @@ namespace Elastic.Clients.Elasticsearch.Aggregations; /// /// Combines aggregations into a single list of aggregations. /// -internal class AggregationCombinator : AggregationBase +internal class AggregationCombinator : Aggregation { - public AggregationCombinator(string name, AggregationBase left, AggregationBase right) : base(name) + public AggregationCombinator(string name, Aggregation left, Aggregation right) { AddAggregation(left); AddAggregation(right); + Name = name; } - internal List Aggregations { get; } = new List(); + public override string? Name { get; internal set; } - //internal override void WrapInContainer(AggregationContainer container) { } + internal List Aggregations { get; } = new List(); - private void AddAggregation(AggregationBase agg) + private void AddAggregation(Aggregation agg) { switch (agg) { diff --git a/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationDictionary.cs b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationDictionary.cs index 276fdfe054e..63a3f2b0b68 100644 --- a/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationDictionary.cs +++ b/src/Elastic.Clients.Elasticsearch/Common/Aggregations/AggregationDictionary.cs @@ -9,7 +9,7 @@ namespace Elastic.Clients.Elasticsearch.Aggregations; /// -/// Describes aggregations that we would like to execute on Elasticsearch. +/// Describes aggregations to execute as part of a search. /// public sealed class AggregationDictionary : IsADictionaryBase { @@ -24,9 +24,9 @@ public AggregationDictionary(Dictionary dictionary public static implicit operator AggregationDictionary(Dictionary dictionary) => new(dictionary); - public static implicit operator AggregationDictionary(AggregationBase aggregator) + public static implicit operator AggregationDictionary(Aggregation aggregator) { - AggregationBase b; + Aggregation b; if (aggregator is AggregationCombinator combinator) { var dict = new AggregationDictionary(); diff --git a/src/Elastic.Clients.Elasticsearch/Common/Query/QueryBase.cs b/src/Elastic.Clients.Elasticsearch/Common/Query/Query.cs similarity index 88% rename from src/Elastic.Clients.Elasticsearch/Common/Query/QueryBase.cs rename to src/Elastic.Clients.Elasticsearch/Common/Query/Query.cs index 514ddabf92c..550cd2a128b 100644 --- a/src/Elastic.Clients.Elasticsearch/Common/Query/QueryBase.cs +++ b/src/Elastic.Clients.Elasticsearch/Common/Query/Query.cs @@ -7,18 +7,6 @@ namespace Elastic.Clients.Elasticsearch.QueryDsl { - // TODO: FieldNameQueryConvertor (see FieldNameQueryFormatter) - public interface IFieldNameQuery - { - Field Field { get; set; } - } - - public abstract class FieldNameQueryBase : QueryBase, IFieldNameQuery - { - [JsonIgnore] - public Field Field { get; set; } - } - public interface IQuery { /// @@ -53,8 +41,8 @@ public interface IQuery /// /// Whether the query should be treated as writable. Used when determining how to combine queries. /// - [JsonIgnore] - bool IsWritable { get; } + //[JsonIgnore] + //bool IsWritable { get; } /// /// The name of the query. Allows you to retrieve for each document what part of the query it matched on. @@ -62,10 +50,10 @@ public interface IQuery //string Name { get; set; } } - public abstract partial class QueryBase : IQuery + public abstract partial class Query : IQuery { - [JsonIgnore] - public bool IsWritable => throw new NotImplementedException(); + //[JsonIgnore] + //public bool IsWritable => throw new NotImplementedException(); ////protected abstract bool Conditionless { get; } //[JsonIgnore] @@ -80,10 +68,10 @@ public abstract partial class QueryBase : IQuery //bool IQuery.Conditionless => Conditionless; //always evaluate to false so that each side of && equation is evaluated - public static bool operator false(QueryBase a) => false; + public static bool operator false(Query a) => false; //always evaluate to false so that each side of && equation is evaluated - public static bool operator true(QueryBase a) => false; + public static bool operator true(Query a) => false; //public static QueryBase operator &(QueryBase leftQuery, QueryBase rightQuery) => Combine(leftQuery, rightQuery, (l, r) => l && r); diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/AggregationContainerSerializationHelper.cs b/src/Elastic.Clients.Elasticsearch/Serialization/AggregationContainerSerializationHelper.cs index 1ffaf579621..29524a65618 100644 --- a/src/Elastic.Clients.Elasticsearch/Serialization/AggregationContainerSerializationHelper.cs +++ b/src/Elastic.Clients.Elasticsearch/Serialization/AggregationContainerSerializationHelper.cs @@ -10,7 +10,7 @@ namespace Elastic.Clients.Elasticsearch internal static class AggregationContainerSerializationHelper { - public static AggregationContainer ReadContainer(ref Utf8JsonReader reader, JsonSerializerOptions options) where T : AggregationBase + public static AggregationContainer ReadContainer(ref Utf8JsonReader reader, JsonSerializerOptions options) where T : Aggregation { var variant = JsonSerializer.Deserialize(ref reader, options); @@ -19,7 +19,7 @@ public static AggregationContainer ReadContainer(ref Utf8JsonReader reader, J return container; } - public static AggregationContainer ReadContainer(string variantName, ref Utf8JsonReader reader, JsonSerializerOptions options) where T : AggregationBase + public static AggregationContainer ReadContainer(string variantName, ref Utf8JsonReader reader, JsonSerializerOptions options) where T : Aggregation { var variant = JsonSerializer.Deserialize(ref reader, options); diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/FieldNameQueryConverterBase.cs b/src/Elastic.Clients.Elasticsearch/Serialization/FieldNameQueryConverterBase.cs deleted file mode 100644 index b07735ccaa7..00000000000 --- a/src/Elastic.Clients.Elasticsearch/Serialization/FieldNameQueryConverterBase.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Licensed to Elasticsearch B.V under one or more agreements. -// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information. - -using System; -using System.Text.Json; -using System.Text.Json.Serialization; -using Elastic.Clients.Elasticsearch.QueryDsl; - -namespace Elastic.Clients.Elasticsearch -{ - /// - /// A base for converters handling field name query variants. - /// - internal abstract class FieldNameQueryConverterBase : JsonConverter where T : FieldNameQueryBase - { - public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType != JsonTokenType.StartObject) - throw new JsonException($"Unexpected JSON response could not be serialized to {typeof(T)}."); - - reader.Read(); // query type - reader.Read(); // start object - reader.Read(); // field name - var fieldName = reader.GetString(); - reader.Read(); - - var query = ReadInternal(ref reader, typeToConvert, options); - query.Field = fieldName; - - if (reader.TokenType != JsonTokenType.EndObject) - throw new JsonException($"Unexpected JSON response could not be serialized to {typeof(T)}."); - - reader.Read(); - - return query; - } - - public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options) - { - if (value.Field is null) - writer.WriteNullValue(); - - if (options.TryGetClientSettings(out var settings)) - { - writer.WriteStartObject(); - writer.WritePropertyName(settings.Inferrer.Field(value.Field)); - WriteInternal(writer, value, options); - writer.WriteEndObject(); - return; - } - - throw new JsonException("Unable to retrieve client settings to infer field."); - } - - internal abstract T? ReadInternal(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options); - internal abstract void WriteInternal(Utf8JsonWriter writer, T value, JsonSerializerOptions options); - } - - -} diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/IsADictionaryConverter.cs b/src/Elastic.Clients.Elasticsearch/Serialization/IsADictionaryConverter.cs index 6d7877ea0b1..7540ac4ae0f 100644 --- a/src/Elastic.Clients.Elasticsearch/Serialization/IsADictionaryConverter.cs +++ b/src/Elastic.Clients.Elasticsearch/Serialization/IsADictionaryConverter.cs @@ -54,3 +54,7 @@ public override void Write(Utf8JsonWriter writer, TType value, JsonSerializerOpt } +internal interface IUnionVerifiable +{ + bool IsSuccessful { get; } +} diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/SourceSerialisation.cs b/src/Elastic.Clients.Elasticsearch/Serialization/SourceSerialisation.cs index 0c78289c266..a9470428235 100644 --- a/src/Elastic.Clients.Elasticsearch/Serialization/SourceSerialisation.cs +++ b/src/Elastic.Clients.Elasticsearch/Serialization/SourceSerialisation.cs @@ -42,16 +42,16 @@ public static void SerializeParams(T toSerialize, Utf8JsonWriter writer, IEla JsonSerializer.Serialize(writer, toSerialize, options); } - public static void DeserializeParams(ref Utf8JsonReader reader, IElasticsearchClientSettings settings) + public static T DeserializeParams(ref Utf8JsonReader reader, IElasticsearchClientSettings settings) { if (settings.Experimental.UseSourceSerializerForScriptParameters) { - Deserialize(ref reader, settings); - return; + var result = Deserialize(ref reader, settings); + return result; } _ = settings.RequestResponseSerializer.TryGetJsonSerializerOptions(out var options); - JsonSerializer.Deserialize(ref reader, options); + return JsonSerializer.Deserialize(ref reader, options); } public static void Serialize(T toSerialize, Utf8JsonWriter writer, IElasticsearchClientSettings settings) => diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/TermsAggregateSerializationHelper.cs b/src/Elastic.Clients.Elasticsearch/Serialization/TermsAggregateSerializationHelper.cs index 1cfd344f638..06abf039ab1 100644 --- a/src/Elastic.Clients.Elasticsearch/Serialization/TermsAggregateSerializationHelper.cs +++ b/src/Elastic.Clients.Elasticsearch/Serialization/TermsAggregateSerializationHelper.cs @@ -15,7 +15,7 @@ internal static class TermsAggregateSerializationHelper private static readonly byte[] s_key = Encoding.UTF8.GetBytes("key"); private static readonly byte s_period = (byte)'.'; - public static bool TryDeserialiseTermsAggregate(ref Utf8JsonReader reader, JsonSerializerOptions options, out AggregateBase? aggregate) + public static bool TryDeserialiseTermsAggregate(ref Utf8JsonReader reader, JsonSerializerOptions options, out IAggregate? aggregate) { aggregate = null; diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/UnionConverter.cs b/src/Elastic.Clients.Elasticsearch/Serialization/UnionConverter.cs index 86062c333c0..edf5251fafa 100644 --- a/src/Elastic.Clients.Elasticsearch/Serialization/UnionConverter.cs +++ b/src/Elastic.Clients.Elasticsearch/Serialization/UnionConverter.cs @@ -12,9 +12,13 @@ namespace Elastic.Clients.Elasticsearch; internal sealed class UnionConverter : JsonConverterFactory { + // Because converters registered on JsonSerializerOptions take priority over the JsonConverter attribute on the type, we need a way to + // mark those types we don't want to use the default union converter. This set is used for that purpose, until a better option can be + // found. private static readonly HashSet TypesToSkip = new() { - typeof(SourceConfig) + typeof(SourceConfig), + typeof(Script) }; public override bool CanConvert(Type typeToConvert) => !TypesToSkip.Contains(typeToConvert) && @@ -67,27 +71,23 @@ private class DerivedUnionConverterInner : JsonConverter< { // TODO - Aggregate Exception if both fail - //var requiresEndObject = false; - var readerCopy = reader; - //if (readerCopy.TokenType == JsonTokenType.StartObject) - //{ - // requiresEndObject = true; - // readerCopy.Read(); - //} - try { var itemOne = JsonSerializer.Deserialize(ref readerCopy, options); - if (itemOne is not null) + if (itemOne is IUnionVerifiable verifiable) + { + if (verifiable.IsSuccessful) + { + reader = readerCopy; + return (TType)Activator.CreateInstance(typeof(TType), itemOne); + } + } + else if (itemOne is not null) { - //if (requiresEndObject) - // readerCopy.Read(); - reader = readerCopy; - return (TType)Activator.CreateInstance(typeof(TType), itemOne); } } @@ -108,9 +108,6 @@ private class DerivedUnionConverterInner : JsonConverter< if (itemTwo is not null) { - //if (requiresEndObject) - // reader.Read(); - return (TType)Activator.CreateInstance(typeof(TType), itemTwo); } } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregateDictionary.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregateDictionary.cs index 26426e5874c..aa10d15f500 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregateDictionary.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregateDictionary.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.Generic; using System.Linq; namespace Elastic.Clients.Elasticsearch.Aggregations @@ -37,18 +38,35 @@ public TermsAggregate Terms(string key) return null; } + Buckets> buckets = null; + switch (agg) { case EmptyTermsAggregate empty: return new TermsAggregate { - Buckets = Array.Empty>().ToReadOnlyCollection(), + Buckets = new Buckets>(Array.Empty>()), Meta = empty.Meta, DocCountErrorUpperBound = empty.DocCountErrorUpperBound, SumOtherDocCount = empty.SumOtherDocCount }; + case StringTermsAggregate stringTerms: - var buckets = stringTerms.Buckets.Select(b => new TermsBucket { DocCount = b.DocCount, DocCountError = b.DocCountError, Key = GetKeyFromBucketKey(b.Key), KeyAsString = b.Key }).ToReadOnlyCollection(); + stringTerms.Buckets.Match(a => + { + var dict = new Dictionary>(); + foreach (var item in a) + { + var key = item.Key; + var value = item.Value; + dict.Add(key, new TermsBucket { DocCount = value.DocCount, DocCountError = value.DocCountError, Key = GetKeyFromBucketKey(value.Key), KeyAsString = value.Key }); + } + buckets = new(dict); + }, a => + { + buckets = new(a.Select(b => new TermsBucket { DocCount = b.DocCount, DocCountError = b.DocCountError, Key = GetKeyFromBucketKey(b.Key), KeyAsString = b.Key }).ToReadOnlyCollection()); + }); + return new TermsAggregate { Buckets = buckets, @@ -56,20 +74,50 @@ public TermsAggregate Terms(string key) DocCountErrorUpperBound = stringTerms.DocCountErrorUpperBound, SumOtherDocCount = stringTerms.SumOtherDocCount }; + case DoubleTermsAggregate doubleTerms: - var doubleTermsBuckets = doubleTerms.Buckets.Select(b => new TermsBucket { DocCount = b.DocCount, DocCountError = b.DocCountError, Key = GetKeyFromBucketKey(b.Key), KeyAsString = b.KeyAsString }).ToReadOnlyCollection(); + doubleTerms.Buckets.Match(a => + { + var dict = new Dictionary>(); + foreach (var item in a) + { + var key = item.Key; + var value = item.Value; + dict.Add(key, new TermsBucket { DocCount = value.DocCount, DocCountError = value.DocCountError, Key = GetKeyFromBucketKey(value.Key), KeyAsString = value.KeyAsString }); + } + buckets = new(dict); + }, a => + { + buckets = new(a.Select(b => new TermsBucket { DocCount = b.DocCount, DocCountError = b.DocCountError, Key = GetKeyFromBucketKey(b.Key), KeyAsString = b.KeyAsString }).ToReadOnlyCollection()); + }); + return new TermsAggregate { - Buckets = doubleTermsBuckets, + Buckets = buckets, Meta = doubleTerms.Meta, DocCountErrorUpperBound = doubleTerms.DocCountErrorUpperBound, SumOtherDocCount = doubleTerms.SumOtherDocCount }; + case LongTermsAggregate longTerms: - var longTermsBuckets = longTerms.Buckets.Select(b => new TermsBucket { DocCount = b.DocCount, DocCountError = b.DocCountError, Key = GetKeyFromBucketKey(b.Key), KeyAsString = b.KeyAsString }).ToReadOnlyCollection(); + longTerms.Buckets.Match(a => + { + var dict = new Dictionary>(); + foreach (var item in a) + { + var key = item.Key; + var value = item.Value; + dict.Add(key, new TermsBucket { DocCount = value.DocCount, DocCountError = value.DocCountError, Key = GetKeyFromBucketKey(value.Key), KeyAsString = value.KeyAsString }); + } + buckets = new(dict); + }, a => + { + buckets = new(a.Select(b => new TermsBucket { DocCount = b.DocCount, DocCountError = b.DocCountError, Key = GetKeyFromBucketKey(b.Key), KeyAsString = b.KeyAsString }).ToReadOnlyCollection()); + }); + return new TermsAggregate { - Buckets = longTermsBuckets, + Buckets = buckets, Meta = longTerms.Meta, DocCountErrorUpperBound = longTerms.DocCountErrorUpperBound, SumOtherDocCount = longTerms.SumOtherDocCount diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregateDictionaryConverter.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregateDictionaryConverter.cs index 560d19a2e6d..cf6ac4355e7 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregateDictionaryConverter.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregateDictionaryConverter.cs @@ -13,7 +13,7 @@ internal sealed class AggregateDictionaryConverter : JsonConverter(); + var dictionary = new Dictionary(); if (reader.TokenType != JsonTokenType.StartObject) return new AggregateDictionary(dictionary); @@ -33,7 +33,7 @@ internal sealed class AggregateDictionaryConverter : JsonConverter dictionary, string name) + public static void ReadAggregate(ref Utf8JsonReader reader, JsonSerializerOptions options, Dictionary dictionary, string name) { var nameParts = name.Split('#'); diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainer.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainer.cs index 721773685d0..43074c11351 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainer.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainer.cs @@ -30,7 +30,7 @@ public partial class AggregationContainer JsonSerializer.Serialize(writer, descriptor, options); }; - public static implicit operator AggregationContainer(AggregationBase aggregator) + public static implicit operator AggregationContainer(Aggregation aggregator) { if (aggregator == null) return null; @@ -44,7 +44,7 @@ public static implicit operator AggregationContainer(AggregationBase aggregator) //aggregator.WrapInContainer(container); - var bucket = aggregator as BucketAggregationBase; + //var bucket = aggregator as BucketAggregationBase; //container.Aggregations = bucket?.Aggregations; diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/EmptyTermsAggregate.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/EmptyTermsAggregate.cs index b6cd25e4383..42cf200b0a4 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/EmptyTermsAggregate.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/EmptyTermsAggregate.cs @@ -2,9 +2,27 @@ // Elasticsearch B.V licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. +using System.Collections.Generic; +using System.Text.Json.Serialization; + namespace Elastic.Clients.Elasticsearch.Aggregations { - public class EmptyTermsAggregate : TermsAggregateBase + public sealed class EmptyTermsAggregate : IAggregate { + [JsonInclude] + [JsonPropertyName("doc_count_error_upper_bound")] + public long? DocCountErrorUpperBound { get; init; } + + [JsonInclude] + [JsonPropertyName("sum_other_doc_count")] + public long SumOtherDocCount { get; init; } + + [JsonInclude] + [JsonPropertyName("buckets")] + public Buckets> Buckets { get; init; } + + [JsonInclude] + [JsonPropertyName("meta")] + public Dictionary? Meta { get; init; } } } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/EmptyTermsBucket.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/EmptyTermsBucket.cs index 2eee452d59f..979fbf3949d 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/EmptyTermsBucket.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/EmptyTermsBucket.cs @@ -4,5 +4,5 @@ namespace Elastic.Clients.Elasticsearch.Aggregations { - public class EmptyTermsBucket { } + public sealed class EmptyTermsBucket { } } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/MultiBucketAggregateBase.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/MultiBucketAggregateBase.cs deleted file mode 100644 index c6043390595..00000000000 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/MultiBucketAggregateBase.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Licensed to Elasticsearch B.V under one or more agreements. -// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information. - -using System.Collections.Generic; -using System.Text.Json.Serialization; - -namespace Elastic.Clients.Elasticsearch.Aggregations -{ - public abstract partial class MultiBucketAggregateBase - { - [JsonInclude] - [JsonPropertyName("buckets")] - public IReadOnlyCollection Buckets { get; init; } - } -} diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/TermsAggregate.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/TermsAggregate.cs index e69698d570b..a0642717d62 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/TermsAggregate.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/TermsAggregate.cs @@ -2,9 +2,27 @@ // Elasticsearch B.V licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. +using System.Collections.Generic; +using System.Text.Json.Serialization; + namespace Elastic.Clients.Elasticsearch.Aggregations { - public class TermsAggregate : TermsAggregateBase> + public sealed class TermsAggregate : IAggregate { + [JsonInclude] + [JsonPropertyName("doc_count_error_upper_bound")] + public long? DocCountErrorUpperBound { get; init; } + + [JsonInclude] + [JsonPropertyName("sum_other_doc_count")] + public long SumOtherDocCount { get; init; } + + [JsonInclude] + [JsonPropertyName("buckets")] + public Buckets> Buckets { get; init; } + + [JsonInclude] + [JsonPropertyName("meta")] + public Dictionary? Meta { get; init; } } } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/TermsBucket.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/TermsBucket.cs index bc9649133b6..3d6d063bf6a 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/TermsBucket.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/TermsBucket.cs @@ -2,10 +2,24 @@ // Elasticsearch B.V licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. +using System.Text.Json.Serialization; + namespace Elastic.Clients.Elasticsearch.Aggregations; -public class TermsBucket : TermsBucketBase +public sealed class TermsBucket { public TKey Key { get; init; } public string? KeyAsString { get; init; } + + [JsonInclude] + [JsonPropertyName("doc_count_error")] + public long? DocCountError { get; init; } + + [JsonInclude] + [JsonPropertyName("aggregations")] + public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary Aggregations { get; init; } + + [JsonInclude] + [JsonPropertyName("doc_count")] + public long DocCount { get; init; } } diff --git a/src/Elastic.Clients.Elasticsearch/Types/AsyncSearch/AsyncSearch.cs b/src/Elastic.Clients.Elasticsearch/Types/AsyncSearch/AsyncSearch.cs index d9ab360f2f3..b774c25c5cf 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/AsyncSearch/AsyncSearch.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/AsyncSearch/AsyncSearch.cs @@ -10,12 +10,21 @@ namespace Elastic.Clients.Elasticsearch.AsyncSearch; public partial class AsyncSearch { + /// + /// Shortcut to the hits returned for this search. + /// [JsonIgnore] public IReadOnlyCollection> Hits => HitsMetadata.Hits; + /// + /// The source documents from the matching hits. + /// [JsonIgnore] public IReadOnlyCollection Documents => HitsMetadata.Hits.Select(s => s.Source).ToReadOnlyCollection(); + /// + /// The total number of hits returned for this search. + /// [JsonIgnore] public long Total => HitsMetadata?.Total?.Value ?? -1; } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateBody.cs b/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateBody.cs index f57db213f72..e9912c16516 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateBody.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateBody.cs @@ -12,7 +12,7 @@ internal class BulkUpdateBody : BulkUpdateBodyBase public TPartialUpdate PartialUpdate { get; set; } - public ScriptBase Script { get; set; } + public Script Script { get; set; } public bool? ScriptedUpsert { get; set; } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperation.cs b/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperation.cs index 508dd47f088..b26cc83b04d 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperation.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperation.cs @@ -44,7 +44,7 @@ public BulkUpdateOperation(TDocument idFrom, TPartialDocument update, bool useId public TDocument IdFrom { get; set; } [JsonIgnore] - public ScriptBase Script { get; set; } + public Script Script { get; set; } [JsonIgnore] public bool? ScriptedUpsert { get; set; } @@ -94,13 +94,13 @@ public static class BulkUpdateOperationFactory public static BulkUpdateOperationWithPartial WithPartial(Id id, IndexName index, TPartial partialDocument) => new(id, index, partialDocument); - public static BulkUpdateOperationWithScript WithScript(Id id, IndexName index, ScriptBase script) => new(id, index, script); + public static BulkUpdateOperationWithScript WithScript(Id id, IndexName index, Script script) => new(id, index, script); - public static BulkUpdateOperationWithScript WithScript(Id id, IndexName index, ScriptBase script, TDocument upsert) => new(upsert, id, index, script); + public static BulkUpdateOperationWithScript WithScript(Id id, IndexName index, Script script, TDocument upsert) => new(upsert, id, index, script); - public static BulkUpdateOperationWithScript WithScript(Id id, ScriptBase script, TDocument upsert) => new(upsert, id, script); + public static BulkUpdateOperationWithScript WithScript(Id id, Script script, TDocument upsert) => new(upsert, id, script); - public static BulkUpdateOperationWithScript WithScript(ScriptBase script, TDocument upsert) => new(upsert, new Id(upsert), script); + public static BulkUpdateOperationWithScript WithScript(Script script, TDocument upsert) => new(upsert, new Id(upsert), script); - public static BulkUpdateOperationWithScript WithScript(Id id, ScriptBase script) => new(id, script); + public static BulkUpdateOperationWithScript WithScript(Id id, Script script) => new(id, script); } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperationDescriptor.cs b/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperationDescriptor.cs index 1df14639d4f..786988de430 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperationDescriptor.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperationDescriptor.cs @@ -26,7 +26,7 @@ public BulkUpdateOperationDescriptor() { } private bool? _docAsUpsert; private bool? _scriptedUpsert; private int? _retriesOnConflict; - private ScriptBase _script; + private Script _script; private Union _source; private Action _inlineScriptAction; @@ -66,7 +66,7 @@ public BulkUpdateOperationDescriptor Script(Action< return Assign(configure, (a, v) => a._storedScriptIdAction = v); } - public BulkUpdateOperationDescriptor Script(ScriptBase script) + public BulkUpdateOperationDescriptor Script(Script script) { _inlineScriptAction = null; _storedScriptIdAction = null; diff --git a/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperationWithScript.cs b/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperationWithScript.cs index 8e055b45d37..7d2fb98b4b2 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperationWithScript.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Bulk/BulkUpdateOperationWithScript.cs @@ -10,13 +10,13 @@ namespace Elastic.Clients.Elasticsearch { public class BulkUpdateOperationWithScript : BulkUpdateOperationBase { - public BulkUpdateOperationWithScript(Id id, ScriptBase script) + public BulkUpdateOperationWithScript(Id id, Script script) { Id = id; Script = script; } - public BulkUpdateOperationWithScript(Id id, IndexName index, ScriptBase script) + public BulkUpdateOperationWithScript(Id id, IndexName index, Script script) { Id = id; Index = index; @@ -24,7 +24,7 @@ public BulkUpdateOperationWithScript(Id id, IndexName index, ScriptBase script) } [JsonIgnore] - public ScriptBase Script { get; set; } + public Script Script { get; set; } protected override string Operation => "update"; @@ -41,9 +41,9 @@ protected override void BeforeSerialize(IElasticsearchClientSettings settings) public sealed class BulkUpdateOperationWithScript : BulkUpdateOperationWithScript { - public BulkUpdateOperationWithScript(TDocument upsert, Id id, ScriptBase script) : base(id, script) => Upsert = upsert; + public BulkUpdateOperationWithScript(TDocument upsert, Id id, Script script) : base(id, script) => Upsert = upsert; - public BulkUpdateOperationWithScript(TDocument upsert, Id id, IndexName index, ScriptBase script) : base(id, index, script) => Upsert = upsert; + public BulkUpdateOperationWithScript(TDocument upsert, Id id, IndexName index, Script script) : base(id, index, script) => Upsert = upsert; [JsonIgnore] public TDocument Upsert { get; set; } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Bulk/ScriptedBulkUpdateBody.cs b/src/Elastic.Clients.Elasticsearch/Types/Bulk/ScriptedBulkUpdateBody.cs index 4b1c3d2b16f..64f22319b1e 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Bulk/ScriptedBulkUpdateBody.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Bulk/ScriptedBulkUpdateBody.cs @@ -8,7 +8,7 @@ namespace Elastic.Clients.Elasticsearch { internal class ScriptedBulkUpdateBody : BulkUpdateBodyBase { - public ScriptBase Script { get; set; } + public Script Script { get; set; } protected override void SerializeProperties(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { diff --git a/src/Elastic.Clients.Elasticsearch/Types/Documents/MultiSearch/MultiSearchRequest.cs b/src/Elastic.Clients.Elasticsearch/Types/Documents/MultiSearch/MultiSearchRequest.cs index 939f89596f4..c8a1b0888ae 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Documents/MultiSearch/MultiSearchRequest.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Documents/MultiSearch/MultiSearchRequest.cs @@ -70,18 +70,6 @@ async Task IStreamSerializable.SerializeAsync(Stream stream, IElasticsearchClien } } - public partial class ResponseBody - { - [JsonIgnore] - public IReadOnlyCollection> Hits => HitsMetadata.Hits; - - [JsonIgnore] - public IReadOnlyCollection Documents => HitsMetadata.Hits.Select(s => s.Source).ToReadOnlyCollection(); - - [JsonIgnore] - public long Total => HitsMetadata?.Total?.Value ?? -1; - } - public partial class MultiSearchResponse { public override bool IsValid => base.IsValid && (Responses?.All(b => b.Item1 is not null && b.Item1.Status == 200) ?? true); diff --git a/src/Elastic.Clients.Elasticsearch/Types/MultiSearchItem.cs b/src/Elastic.Clients.Elasticsearch/Types/MultiSearchItem.cs new file mode 100644 index 00000000000..bb0ab128deb --- /dev/null +++ b/src/Elastic.Clients.Elasticsearch/Types/MultiSearchItem.cs @@ -0,0 +1,21 @@ +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information. + +using System.Collections.Generic; +using System.Linq; +using System.Text.Json.Serialization; + +namespace Elastic.Clients.Elasticsearch; + +public partial class MultiSearchItem +{ + [JsonIgnore] + public IReadOnlyCollection> Hits => HitsMetadata.Hits; + + [JsonIgnore] + public IReadOnlyCollection Documents => HitsMetadata.Hits.Select(s => s.Source).ToReadOnlyCollection(); + + [JsonIgnore] + public long Total => HitsMetadata?.Total?.Value ?? -1; +} diff --git a/src/Elastic.Clients.Elasticsearch/Types/ScriptBase.cs b/src/Elastic.Clients.Elasticsearch/Types/ScriptBase.cs index d3cf605dfd0..4360134fe50 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/ScriptBase.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/ScriptBase.cs @@ -8,52 +8,57 @@ namespace Elastic.Clients.Elasticsearch; -[JsonConverter(typeof(ScriptBaseConverter))] -public abstract partial class ScriptBase -{ -} - -internal sealed class ScriptBaseConverter : JsonConverter -{ - public override ScriptBase? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - var readAheadCopy = reader; - - if (readAheadCopy.TokenType == JsonTokenType.String) - { - var source = reader.GetString(); - return new InlineScript(source); - } - - readAheadCopy.Read(); // { - - if (readAheadCopy.TokenType != JsonTokenType.PropertyName) - throw new JsonException("Unexpected token type"); - - if (readAheadCopy.ValueTextEquals("params")) - { - while (readAheadCopy.Read() && readAheadCopy.TokenType != JsonTokenType.EndObject) - { - } - - readAheadCopy.Read(); - } - - if (readAheadCopy.ValueTextEquals("id")) - return JsonSerializer.Deserialize(ref reader, options); - - return JsonSerializer.Deserialize(ref reader, options); - } - - public override void Write(Utf8JsonWriter writer, ScriptBase value, JsonSerializerOptions options) - { - if (value is InlineScript scriptSort) - JsonSerializer.Serialize(writer, scriptSort, options); - - else if (value is StoredScriptId storedScript) - JsonSerializer.Serialize(writer, storedScript, options); - - else - throw new JsonException("Unsupported script implementation"); - } -} +//public interface IScript { } + +///// +///// Base class for scripts +///// +//[JsonConverter(typeof(ScriptBaseConverter))] +//public abstract class Script : IScript +//{ +//} + +//internal sealed class ScriptBaseConverter : JsonConverter