From 4f203dbdf5a96fc5c73def8ceee54f2c4ce58dac Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 21 Nov 2022 17:31:03 +0000 Subject: [PATCH] Align specification tweaks and naming with Java (#6982) * Remove container suffixes * Manual type renaming to align with Java * Rename requests and responses to align with Java * Remove range query until ambiguous union is handled * EQL Get Status fixup * Skip SimpleQueryStringFlags until generated correctly * Eql API URLs --- benchmarks/Benchmarks/Program.cs | 16 +- benchmarks/Profiling/Program.cs | 4 +- ...ConnectionSettingsAwareContractResolver.cs | 20 +- .../HandleNestTypesOnSourceJsonConverter.cs | 2 +- ...Request.cs => SubmitAsyncSearchRequest.cs} | 10 +- .../Api/CountRequest.cs | 4 +- .../{GetEqlResponse.cs => EqlGetResponse.cs} | 2 +- ...quest.cs => GetSourceRequestDescriptor.cs} | 10 +- ...SourceResponse.cs => GetSourceResponse.cs} | 2 +- ...ppingResponse.cs => GetMappingResponse.cs} | 6 +- ...etAsyncResponse.cs => GetAsyncResponse.cs} | 2 +- .../Aggregations/AggregationCombinator.cs | 8 +- .../Aggregations/AggregationDictionary.cs | 16 +- .../{Aggregation.cs => SearchAggregation.cs} | 12 +- .../Core/Extensions/Extensions.cs | 4 +- .../Core/Query/Query.cs | 22 +- ...r.cs => AggregationSerializationHelper.cs} | 12 +- .../ResponseItemConverterFactory.cs | 16 +- ...AggregationContainer.cs => Aggregation.cs} | 12 +- ...Descriptor.cs => AggregationDescriptor.cs} | 8 +- ...tainerDescriptor.cs => QueryDescriptor.cs} | 9 +- .../_Generated/Api/ApiUrlsLookup.g.cs | 26 +- ...est.g.cs => SubmitAsyncSearchRequest.g.cs} | 469 ++++--- ...se.g.cs => SubmitAsyncSearchResponse.g.cs} | 2 +- ...rHealthRequest.g.cs => HealthRequest.g.cs} | 68 +- ...ealthResponse.g.cs => HealthResponse.g.cs} | 2 +- .../_Generated/Api/CountRequest.g.cs | 30 +- .../_Generated/Api/DeleteByQueryRequest.g.cs | 30 +- ...eEqlRequest.g.cs => EqlDeleteRequest.g.cs} | 26 +- ...qlResponse.g.cs => EqlDeleteResponse.g.cs} | 2 +- ...{GetEqlRequest.g.cs => EqlGetRequest.g.cs} | 34 +- ...etEqlResponse.g.cs => EqlGetResponse.g.cs} | 2 +- .../_Generated/Api/Eql/EqlSearchRequest.g.cs | 42 +- ...sRequest.g.cs => GetEqlStatusRequest.g.cs} | 26 +- ...esponse.g.cs => GetEqlStatusResponse.g.cs} | 2 +- .../_Generated/Api/ExplainRequest.g.cs | 30 +- .../_Generated/Api/FieldCapsRequest.g.cs | 30 +- ...uest.g.cs => GetScriptContextRequest.g.cs} | 10 +- ...nse.g.cs => GetScriptContextResponse.g.cs} | 2 +- ...st.g.cs => GetScriptLanguagesRequest.g.cs} | 10 +- ...e.g.cs => GetScriptLanguagesResponse.g.cs} | 2 +- ...riptRequest.g.cs => GetScriptRequest.g.cs} | 30 +- ...ptResponse.g.cs => GetScriptResponse.g.cs} | 2 +- ...urceRequest.g.cs => GetSourceRequest.g.cs} | 80 +- ...ceResponse.g.cs => GetSourceResponse.g.cs} | 2 +- ...litRequest.g.cs => CloneIndexRequest.g.cs} | 56 +- ...eResponse.g.cs => CloneIndexResponse.g.cs} | 2 +- ...oseRequest.g.cs => CloseIndexRequest.g.cs} | 50 +- ...eResponse.g.cs => CloseIndexResponse.g.cs} | 2 +- ...teRequest.g.cs => CreateIndexRequest.g.cs} | 68 +- ...Response.g.cs => CreateIndexResponse.g.cs} | 2 +- ...teRequest.g.cs => DeleteIndexRequest.g.cs} | 46 +- ...Response.g.cs => DeleteIndexResponse.g.cs} | 2 +- ...AliasRequest.g.cs => GetAliasRequest.g.cs} | 56 +- ...GetResponse.g.cs => GetAliasResponse.g.cs} | 6 +- ...Request.g.cs => GetDataStreamRequest.g.cs} | 18 +- ...sponse.g.cs => GetDataStreamResponse.g.cs} | 2 +- ...quest.g.cs => GetFieldMappingRequest.g.cs} | 56 +- ...onse.g.cs => GetFieldMappingResponse.g.cs} | 6 +- .../{GetRequest.g.cs => GetIndexRequest.g.cs} | 58 +- ...iasResponse.g.cs => GetIndexResponse.g.cs} | 6 +- ...uest.g.cs => GetIndexTemplateRequest.g.cs} | 22 +- ...nse.g.cs => GetIndexTemplateResponse.g.cs} | 2 +- ...ingRequest.g.cs => GetMappingRequest.g.cs} | 44 +- ...gResponse.g.cs => GetMappingResponse.g.cs} | 6 +- ...teRequest.g.cs => GetTemplateRequest.g.cs} | 22 +- ...Response.g.cs => GetTemplateResponse.g.cs} | 6 +- ...sRequest.g.cs => IndicesStatsRequest.g.cs} | 76 +- ...esponse.g.cs => IndicesStatsResponse.g.cs} | 2 +- ...OpenRequest.g.cs => OpenIndexRequest.g.cs} | 50 +- ...enResponse.g.cs => OpenIndexResponse.g.cs} | 2 +- .../Api/IndexManagement/PutAliasRequest.g.cs | 30 +- ...nkRequest.g.cs => ShrinkIndexRequest.g.cs} | 50 +- ...Response.g.cs => ShrinkIndexResponse.g.cs} | 2 +- ...oneRequest.g.cs => SplitIndexRequest.g.cs} | 56 +- ...eResponse.g.cs => SplitIndexResponse.g.cs} | 2 +- .../_Generated/Api/MultiGetRequest.g.cs | 42 +- .../_Generated/Api/MultiGetResponse.g.cs | 2 +- .../_Generated/Api/MultiSearchResponse.g.cs | 2 +- .../Api/MultiSearchTemplateResponse.g.cs | 2 +- .../_Generated/Api/SearchRequest.g.cs | 84 +- ...orRequest.g.cs => ClearCursorRequest.g.cs} | 12 +- ...Response.g.cs => ClearCursorResponse.g.cs} | 2 +- ...ncRequest.g.cs => DeleteAsyncRequest.g.cs} | 26 +- ...Response.g.cs => DeleteAsyncResponse.g.cs} | 2 +- ...AsyncRequest.g.cs => GetAsyncRequest.g.cs} | 42 +- ...yncResponse.g.cs => GetAsyncResponse.g.cs} | 2 +- ...equest.g.cs => GetAsyncStatusRequest.g.cs} | 26 +- ...ponse.g.cs => GetAsyncStatusResponse.g.cs} | 2 +- ...SqlQueryRequest.g.cs => QueryRequest.g.cs} | 106 +- ...lQueryResponse.g.cs => QueryResponse.g.cs} | 2 +- .../_Generated/Api/TermsEnumRequest.g.cs | 30 +- .../_Generated/Api/UpdateByQueryRequest.g.cs | 30 +- .../ElasticsearchClient.AsyncSearch.g.cs | 84 +- .../Client/ElasticsearchClient.Cluster.g.cs | 44 +- .../Client/ElasticsearchClient.Eql.g.cs | 140 +-- .../Client/ElasticsearchClient.Indices.g.cs | 1088 ++++++++--------- .../Client/ElasticsearchClient.Sql.g.cs | 208 ++-- .../Client/ElasticsearchClient.g.cs | 428 +++---- .../AdjacencyMatrixAggregation.g.cs | 38 +- .../Types/Aggregations/Aggregation.g.cs | 921 ++++++++++++++ .../Aggregations/AggregationContainer.g.cs | 921 -------------- .../AutoDateHistogramAggregation.g.cs | 22 +- .../Aggregations/AverageAggregation.g.cs | 2 +- .../Aggregations/BoxplotAggregation.g.cs | 2 +- .../Aggregations/CardinalityAggregation.g.cs | 2 +- .../Aggregations/ChildrenAggregation.g.cs | 22 +- .../Aggregations/CompositeAggregation.g.cs | 22 +- .../CumulativeCardinalityAggregation.g.cs | 2 +- .../DateHistogramAggregation.g.cs | 22 +- .../Aggregations/DateRangeAggregation.g.cs | 22 +- .../Aggregations/DerivativeAggregation.g.cs | 2 +- .../ExtendedStatsAggregation.g.cs | 2 +- .../ExtendedStatsBucketAggregation.g.cs | 2 +- .../Aggregations/FiltersAggregation.g.cs | 34 +- .../Types/Aggregations/GlobalAggregation.g.cs | 22 +- .../Aggregations/HistogramAggregation.g.cs | 22 +- .../Aggregations/InferenceAggregation.g.cs | 34 +- ...figContainer.g.cs => InferenceConfig.g.cs} | 58 +- .../Aggregations/IpRangeAggregation.g.cs | 22 +- .../Aggregations/MatrixStatsAggregation.g.cs | 2 +- .../Types/Aggregations/MaxAggregation.g.cs | 2 +- .../MedianAbsoluteDeviationAggregation.g.cs | 2 +- .../Types/Aggregations/MinAggregation.g.cs | 2 +- .../Aggregations/MissingAggregation.g.cs | 22 +- .../Aggregations/MultiTermsAggregation.g.cs | 22 +- .../Types/Aggregations/NestedAggregation.g.cs | 22 +- .../Types/Aggregations/ParentAggregation.g.cs | 22 +- .../PercentilesBucketAggregation.g.cs | 2 +- .../Types/Aggregations/RangeAggregation.g.cs | 22 +- .../Types/Aggregations/RateAggregation.g.cs | 2 +- .../ReverseNestedAggregation.g.cs | 22 +- .../Aggregations/SamplerAggregation.g.cs | 22 +- .../ScriptedMetricAggregation.g.cs | 2 +- .../Types/Aggregations/StatsAggregation.g.cs | 2 +- .../Aggregations/StatsBucketAggregation.g.cs | 2 +- .../Aggregations/StringStatsAggregation.g.cs | 2 +- .../Types/Aggregations/SumAggregation.g.cs | 2 +- .../Types/Aggregations/TTestAggregation.g.cs | 2 +- .../Types/Aggregations/TermsAggregation.g.cs | 22 +- .../Types/Aggregations/TestPopulation.g.cs | 30 +- .../Aggregations/TopHitsAggregation.g.cs | 2 +- .../Aggregations/TopMetricsAggregation.g.cs | 2 +- .../Aggregations/ValueCountAggregation.g.cs | 2 +- .../VariableWidthHistogramAggregation.g.cs | 2 +- .../WeightedAverageAggregation.g.cs | 2 +- ...{Operation.g.cs => MultiGetOperation.g.cs} | 22 +- .../Types/Core/MSearch/MultisearchBody.g.cs | 547 ++------- ...nseItem.g.cs => MultiGetResponseItem.g.cs} | 6 +- ...Item.g.cs => MultiSearchResponseItem.g.cs} | 6 +- .../Types/Core/RankEval/RankEvalQuery.g.cs | 30 +- .../_Generated/Types/Core/Reindex/Source.g.cs | 30 +- .../Core/Search/CompletionSuggester.g.cs | 2 +- .../Types/Core/Search/Highlight.g.cs | 30 +- .../Types/Core/Search/HighlightField.g.cs | 30 +- .../Core/Search/LaplaceSmoothingModel.g.cs | 2 +- .../LinearInterpolationSmoothingModel.g.cs | 2 +- .../Types/Core/Search/PhraseSuggester.g.cs | 32 +- .../Types/Core/Search/RescoreQuery.g.cs | 30 +- ...odelContainer.g.cs => SmoothingModel.g.cs} | 68 +- .../Search/StupidBackoffSmoothingModel.g.cs | 2 +- .../Types/Core/Search/TermSuggester.g.cs | 2 +- .../Core/SearchShards/ShardStoreIndex.g.cs | 2 +- .../Types/Enums/Enums.QueryDsl.g.cs | 168 --- .../Types/IndexManagement/Alias.g.cs | 30 +- .../IndexManagement/AliasDefinition.g.cs | 30 +- .../_Generated/Types/KnnQuery.g.cs | 42 +- .../Types/Ml/FillMaskInferenceOptions.g.cs | 18 +- .../Ml/FillMaskInferenceUpdateOptions.g.cs | 2 +- .../Types/Ml/InferenceConfigCreate.g.cs | 327 +++++ .../Ml/InferenceConfigCreateContainer.g.cs | 327 ----- .../Types/Ml/InferenceConfigUpdate.g.cs | 327 +++++ .../Ml/InferenceConfigUpdateContainer.g.cs | 327 ----- .../Types/Ml/NerInferenceOptions.g.cs | 18 +- .../Types/Ml/NerInferenceUpdateOptions.g.cs | 2 +- .../Ml/NlpRobertaTokenizationConfig.g.cs | 2 +- .../Types/Ml/PassThroughInferenceOptions.g.cs | 18 +- .../Ml/PassThroughInferenceUpdateOptions.g.cs | 2 +- .../Ml/QuestionAnsweringInferenceOptions.g.cs | 18 +- ...estionAnsweringInferenceUpdateOptions.g.cs | 2 +- .../TextClassificationInferenceOptions.g.cs | 18 +- ...tClassificationInferenceUpdateOptions.g.cs | 2 +- .../Ml/TextEmbeddingInferenceOptions.g.cs | 18 +- .../TextEmbeddingInferenceUpdateOptions.g.cs | 2 +- ...Container.g.cs => TokenizationConfig.g.cs} | 68 +- ...eroShotClassificationInferenceOptions.g.cs | 18 +- ...tClassificationInferenceUpdateOptions.g.cs | 2 +- .../_Generated/Types/NestedSortValue.g.cs | 30 +- .../_Generated/Types/QueryDsl/BoolQuery.g.cs | 172 +-- .../Types/QueryDsl/BoostingQuery.g.cs | 64 +- .../Types/QueryDsl/CombinedFieldsQuery.g.cs | 4 +- .../Types/QueryDsl/ConstantScoreQuery.g.cs | 34 +- .../Types/QueryDsl/DateRangeQuery.g.cs | 635 ---------- .../Types/QueryDsl/DisMaxQuery.g.cs | 46 +- .../Types/QueryDsl/ExistsQuery.g.cs | 4 +- .../FieldValueFactorScoreFunction.g.cs | 2 +- ...ScoreContainer.g.cs => FunctionScore.g.cs} | 108 +- .../Types/QueryDsl/FunctionScoreQuery.g.cs | 76 +- .../_Generated/Types/QueryDsl/FuzzyQuery.g.cs | 4 +- .../Types/QueryDsl/HasChildQuery.g.cs | 34 +- .../Types/QueryDsl/HasParentQuery.g.cs | 34 +- .../_Generated/Types/QueryDsl/IdsQuery.g.cs | 4 +- ...IntervalsContainer.g.cs => Intervals.g.cs} | 116 +- .../Types/QueryDsl/IntervalsAllOf.g.cs | 42 +- .../Types/QueryDsl/IntervalsAnyOf.g.cs | 42 +- .../Types/QueryDsl/IntervalsQuery.g.cs | 4 +- .../Types/QueryDsl/MatchAllQuery.g.cs | 4 +- .../Types/QueryDsl/MatchBoolPrefixQuery.g.cs | 4 +- .../Types/QueryDsl/MatchNoneQuery.g.cs | 4 +- .../QueryDsl/MatchPhrasePrefixQuery.g.cs | 4 +- .../Types/QueryDsl/MatchPhraseQuery.g.cs | 4 +- .../_Generated/Types/QueryDsl/MatchQuery.g.cs | 4 +- .../Types/QueryDsl/MoreLikeThisQuery.g.cs | 4 +- .../Types/QueryDsl/MultiMatchQuery.g.cs | 4 +- .../Types/QueryDsl/NestedQuery.g.cs | 34 +- .../Types/QueryDsl/NumberRangeQuery.g.cs | 551 --------- .../Types/QueryDsl/ParentIdQuery.g.cs | 4 +- .../Types/QueryDsl/PercolateQuery.g.cs | 4 +- .../Types/QueryDsl/PrefixQuery.g.cs | 4 +- .../_Generated/Types/QueryDsl/Query.g.cs | 889 ++++++++++++++ .../Types/QueryDsl/QueryContainer.g.cs | 902 -------------- .../Types/QueryDsl/QueryStringQuery.g.cs | 4 +- .../Types/QueryDsl/RandomScoreFunction.g.cs | 2 +- .../_Generated/Types/QueryDsl/RangeQuery.g.cs | 38 - .../Types/QueryDsl/RankFeatureQuery.g.cs | 4 +- .../Types/QueryDsl/RegexpQuery.g.cs | 4 +- .../Types/QueryDsl/ScriptQuery.g.cs | 4 +- .../Types/QueryDsl/ScriptScoreFunction.g.cs | 2 +- .../Types/QueryDsl/ScriptScoreQuery.g.cs | 34 +- .../QueryDsl/SimpleQueryStringFlags.g.cs | 38 - .../QueryDsl/SimpleQueryStringQuery.g.cs | 36 +- .../Types/QueryDsl/SpanContainingQuery.g.cs | 2 +- .../Types/QueryDsl/SpanFieldMaskingQuery.g.cs | 2 +- .../Types/QueryDsl/SpanFirstQuery.g.cs | 2 +- .../Types/QueryDsl/SpanMultiTermQuery.g.cs | 32 +- .../Types/QueryDsl/SpanNearQuery.g.cs | 2 +- .../Types/QueryDsl/SpanNotQuery.g.cs | 2 +- .../Types/QueryDsl/SpanOrQuery.g.cs | 2 +- .../_Generated/Types/QueryDsl/SpanQuery.g.cs | 2 +- .../Types/QueryDsl/SpanTermQuery.g.cs | 2 +- .../Types/QueryDsl/SpanWithinQuery.g.cs | 2 +- .../_Generated/Types/QueryDsl/TermQuery.g.cs | 4 +- .../_Generated/Types/QueryDsl/TermsQuery.g.cs | 4 +- .../Types/QueryDsl/TermsSetQuery.g.cs | 4 +- .../Types/QueryDsl/WildcardQuery.g.cs | 4 +- .../Types/QueryDsl/WrapperQuery.g.cs | 4 +- ...roupByContainer.g.cs => PivotGroupBy.g.cs} | 74 +- src/Playground/Program.cs | 6 +- src/PlaygroundV7x/Program.cs | 16 +- .../Clusters/ClientTestClusterBase.cs | 4 +- tests/Tests.Domain/ProjectPercolation.cs | 2 +- .../Aggregations/AggregationMetaUsageTests.cs | 2 +- .../Aggregations/AggregationUsageTestBase.cs | 4 +- .../DateHistogramAggregationUsageTests.cs | 2 +- .../Bucket/TermsAggregationUsageTests.cs | 2 +- .../Metric/AverageAggregationUsageTests.cs | 2 +- .../Metric/BoxplotAggregationUsageTests.cs | 2 +- .../CardinalityAggregationUsageTests.cs | 2 +- .../ExtendedStatsAggregationUsageTests.cs | 8 +- .../Metric/MaxAggregationUsageTests.cs | 2 +- ...nAbsoluteDeviationAggregationUsageTests.cs | 2 +- .../Metric/MinAggregationUsageTests.cs | 2 +- .../Metric/StatsAggregationUsageTests.cs | 2 +- .../StringStatsAggregationUsageTests.cs | 2 +- ...tsWithDistributionAggregationUsageTests.cs | 2 +- .../Metric/SumAggregationUsageTests.cs | 2 +- .../Metric/ValueCountAggregationUsageTests.cs | 2 +- .../WeightedAverageAggregationUsageTests.cs | 2 +- .../AsyncSearchApiCoordinatedTests.cs | 6 +- .../HighLevel/Mapping/AutoMap.doc.cs | 2 +- .../Serialization/CustomSerialization.doc.cs | 6 +- .../ClusterHealth/ClusterHealthApiTests.cs | 4 +- ...usterHealthResponseDeserialisationTests.cs | 4 +- .../ClusterHealthShardsApiTests.cs | 8 +- .../DeleteByQuery/DeleteByQueryApiTests.cs | 6 +- .../Tests/Eql/EqlSearchApiCoordinatedTests.cs | 18 +- .../CreateIndexSerializationTests.cs | 6 +- .../Mapping/GetMappingApiTests.cs | 18 +- .../Tests/PointInTime/PointInTimeApiTests.cs | 2 +- tests/Tests/Search/Count/CountApiTests.cs | 23 +- tests/Tests/Search/Search/SearchApiTests.cs | 58 +- .../MinAggregationDeserializationTests.cs | 2 +- .../Aggregations/WritingAggregationsTests.cs | 2 +- .../Documents/MGetSerialization.cs | 14 +- .../MappingResponseSerializationTests.cs | 4 +- .../Queries/FieldNameQueryConverterTests.cs | 10 +- .../IntervalsQuerySerializationTests.cs | 2 +- .../Queries/MultipleSearchFiltersTests.cs | 26 +- .../Queries/SearchSerializationTests.cs | 6 +- .../ReadOnlyIndexNameDictionaryTests.cs | 6 +- tests/Tests/Sql/ClearSqlCursorApiTests.cs | 8 +- .../Tests/Sql/SqlSearchApiCoordinatedTests.cs | 24 +- ...e_Query_WithSimpleMatchQuery.verified.txt} | 0 ...criptor_WithSimpleMatchQuery.verified.txt} | 0 294 files changed, 6043 insertions(+), 7914 deletions(-) rename src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/{AsyncSearchSubmitRequest.cs => SubmitAsyncSearchRequest.cs} (72%) rename src/Elastic.Clients.Elasticsearch/Api/Eql/{GetEqlResponse.cs => EqlGetResponse.cs} (94%) rename src/Elastic.Clients.Elasticsearch/Api/{SourceRequest.cs => GetSourceRequestDescriptor.cs} (50%) rename src/Elastic.Clients.Elasticsearch/Api/{SourceResponse.cs => GetSourceResponse.cs} (92%) rename src/Elastic.Clients.Elasticsearch/Api/IndexManagement/{MappingResponse.cs => GetMappingResponse.cs} (72%) rename src/Elastic.Clients.Elasticsearch/Api/Sql/{SqlGetAsyncResponse.cs => GetAsyncResponse.cs} (91%) rename src/Elastic.Clients.Elasticsearch/Core/Aggregations/{Aggregation.cs => SearchAggregation.cs} (66%) rename src/Elastic.Clients.Elasticsearch/Serialization/{AggregationContainerSerializationHelper.cs => AggregationSerializationHelper.cs} (53%) rename src/Elastic.Clients.Elasticsearch/Types/Aggregations/{AggregationContainer.cs => Aggregation.cs} (62%) rename src/Elastic.Clients.Elasticsearch/Types/Aggregations/{AggregationContainerDescriptor.cs => AggregationDescriptor.cs} (77%) rename src/Elastic.Clients.Elasticsearch/Types/QueryDsl/{QueryContainerDescriptor.cs => QueryDescriptor.cs} (69%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/{AsyncSearchSubmitRequest.g.cs => SubmitAsyncSearchRequest.g.cs} (82%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/{AsyncSearchSubmitResponse.g.cs => SubmitAsyncSearchResponse.g.cs} (97%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/{ClusterHealthRequest.g.cs => HealthRequest.g.cs} (58%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/{ClusterHealthResponse.g.cs => HealthResponse.g.cs} (97%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/{DeleteEqlRequest.g.cs => EqlDeleteRequest.g.cs} (74%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/{DeleteEqlResponse.g.cs => EqlDeleteResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/{GetEqlRequest.g.cs => EqlGetRequest.g.cs} (77%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/{GetEqlResponse.g.cs => EqlGetResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/{EqlGetStatusRequest.g.cs => GetEqlStatusRequest.g.cs} (73%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/{EqlGetStatusResponse.g.cs => GetEqlStatusResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/{ScriptContextRequest.g.cs => GetScriptContextRequest.g.cs} (80%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/{ScriptContextResponse.g.cs => GetScriptContextResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/{ScriptLanguagesRequest.g.cs => GetScriptLanguagesRequest.g.cs} (80%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/{ScriptLanguagesResponse.g.cs => GetScriptLanguagesResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/{ScriptRequest.g.cs => GetScriptRequest.g.cs} (65%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/{ScriptResponse.g.cs => GetScriptResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/{SourceRequest.g.cs => GetSourceRequest.g.cs} (55%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/{SourceResponse.g.cs => GetSourceResponse.g.cs} (94%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{SplitRequest.g.cs => CloneIndexRequest.g.cs} (64%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{CreateResponse.g.cs => CloneIndexResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{CloseRequest.g.cs => CloseIndexRequest.g.cs} (59%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{CloseResponse.g.cs => CloseIndexResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{CreateRequest.g.cs => CreateIndexRequest.g.cs} (69%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{ShrinkResponse.g.cs => CreateIndexResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{DeleteRequest.g.cs => DeleteIndexRequest.g.cs} (60%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{DeleteResponse.g.cs => DeleteIndexResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{AliasRequest.g.cs => GetAliasRequest.g.cs} (54%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{GetResponse.g.cs => GetAliasResponse.g.cs} (79%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{DataStreamRequest.g.cs => GetDataStreamRequest.g.cs} (74%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{DataStreamResponse.g.cs => GetDataStreamResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{FieldMappingRequest.g.cs => GetFieldMappingRequest.g.cs} (54%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{FieldMappingResponse.g.cs => GetFieldMappingResponse.g.cs} (78%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{GetRequest.g.cs => GetIndexRequest.g.cs} (59%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{AliasResponse.g.cs => GetIndexResponse.g.cs} (79%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{IndexTemplateRequest.g.cs => GetIndexTemplateRequest.g.cs} (72%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{IndexTemplateResponse.g.cs => GetIndexTemplateResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{MappingRequest.g.cs => GetMappingRequest.g.cs} (62%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{MappingResponse.g.cs => GetMappingResponse.g.cs} (78%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{TemplateRequest.g.cs => GetTemplateRequest.g.cs} (74%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{TemplateResponse.g.cs => GetTemplateResponse.g.cs} (81%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{StatsRequest.g.cs => IndicesStatsRequest.g.cs} (53%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{StatsResponse.g.cs => IndicesStatsResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{OpenRequest.g.cs => OpenIndexRequest.g.cs} (59%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{OpenResponse.g.cs => OpenIndexResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{ShrinkRequest.g.cs => ShrinkIndexRequest.g.cs} (62%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{SplitResponse.g.cs => ShrinkIndexResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{CloneRequest.g.cs => SplitIndexRequest.g.cs} (63%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/{CloneResponse.g.cs => SplitIndexResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlClearCursorRequest.g.cs => ClearCursorRequest.g.cs} (81%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlClearCursorResponse.g.cs => ClearCursorResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlDeleteAsyncRequest.g.cs => DeleteAsyncRequest.g.cs} (65%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlDeleteAsyncResponse.g.cs => DeleteAsyncResponse.g.cs} (95%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlGetAsyncRequest.g.cs => GetAsyncRequest.g.cs} (61%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlGetAsyncResponse.g.cs => GetAsyncResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlGetAsyncStatusRequest.g.cs => GetAsyncStatusRequest.g.cs} (64%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlGetAsyncStatusResponse.g.cs => GetAsyncStatusResponse.g.cs} (96%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlQueryRequest.g.cs => QueryRequest.g.cs} (72%) rename src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/{SqlQueryResponse.g.cs => QueryResponse.g.cs} (96%) create mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregationContainer.g.cs rename src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/{InferenceConfigContainer.g.cs => InferenceConfig.g.cs} (60%) rename src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/{Operation.g.cs => MultiGetOperation.g.cs} (81%) rename src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/{ResponseItem.g.cs => MultiGetResponseItem.g.cs} (79%) rename src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/{SearchResponseItem.g.cs => MultiSearchResponseItem.g.cs} (78%) rename src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/{SmoothingModelContainer.g.cs => SmoothingModel.g.cs} (58%) create mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreate.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs create mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdate.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs rename src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/{TokenizationConfigContainer.g.cs => TokenizationConfig.g.cs} (58%) delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs rename src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/{FunctionScoreContainer.g.cs => FunctionScore.g.cs} (59%) rename src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/{IntervalsContainer.g.cs => Intervals.g.cs} (51%) delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs create mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RangeQuery.g.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringFlags.g.cs rename src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/{PivotGroupByContainer.g.cs => PivotGroupBy.g.cs} (55%) rename tests/Tests/_VerifySnapshots/{QueryContainer_WithFieldNameQuery_SerializationTests.CanDeserialize_QueryContainer_WithSimpleMatchQuery.verified.txt => Query_WithFieldNameQuery_SerializationTests.CanDeserialize_Query_WithSimpleMatchQuery.verified.txt} (100%) rename tests/Tests/_VerifySnapshots/{QueryContainer_WithFieldNameQuery_SerializationTests.CanSerialize_QueryContainerDescriptor_WithSimpleMatchQuery.verified.txt => Query_WithFieldNameQuery_SerializationTests.CanSerialize_QueryDescriptor_WithSimpleMatchQuery.verified.txt} (100%) diff --git a/benchmarks/Benchmarks/Program.cs b/benchmarks/Benchmarks/Program.cs index ba4b7dc9ef7..200ee1b1f19 100644 --- a/benchmarks/Benchmarks/Program.cs +++ b/benchmarks/Benchmarks/Program.cs @@ -173,56 +173,56 @@ public class BulkIngest public void Version7() { Stream.Position = 0; - _ = NestClient.RequestResponseSerializer.Deserialize(Stream); + _ = NestClient.RequestResponseSerializer.Deserialize(Stream); } [Benchmark] public void Version8() { Stream.Position = 0; - _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); + _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); } // [Benchmark] // public void Version8_String() // { // Stream.Position = 0; - // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); + // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); // } //[Benchmark] //public void Version8_String_Converter() //{ // Stream.Position = 0; - // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); + // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); //} //[Benchmark] //public void Version8_String_ConverterWithBool() //{ // Stream.Position = 0; - // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); + // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); //} //[Benchmark] //public void Version8_String_ConverterWithSpan() //{ // Stream.Position = 0; - // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); + // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); //} //[Benchmark] //public void Version8_SourceWithoutUsingContext() //{ // Stream.Position = 0; - // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); + // _ = AlphaClient.RequestResponseSerializer.Deserialize(Stream); //} //[Benchmark] //public void Version8_SourceDirect() //{ // Stream.Position = 0; - // _ = JsonSerializer.Deserialize(Stream, Elastic.Clients.Elasticsearch.Cluster.ClusterHealthResponseV4Context.Default.ClusterHealthResponseV4); + // _ = JsonSerializer.Deserialize(Stream, Elastic.Clients.Elasticsearch.Cluster.HealthResponseV4Context.Default.HealthResponseV4); //} } diff --git a/benchmarks/Profiling/Program.cs b/benchmarks/Profiling/Program.cs index 3fbb4693f29..16e4281bf1e 100644 --- a/benchmarks/Profiling/Program.cs +++ b/benchmarks/Profiling/Program.cs @@ -31,7 +31,7 @@ //var observer = bulkAll.Wait(TimeSpan.FromMinutes(1), n => { }); -_ = await alphaClient.RequestResponseSerializer.DeserializeAsync(stream); +_ = await alphaClient.RequestResponseSerializer.DeserializeAsync(stream); MemoryProfiler.ForceGc(); @@ -47,7 +47,7 @@ //observer = bulkAll.Wait(TimeSpan.FromMinutes(1), n => { }); -var result = await alphaClient.RequestResponseSerializer.DeserializeAsync(stream); +var result = await alphaClient.RequestResponseSerializer.DeserializeAsync(stream); MemoryProfiler.GetSnapshot(); diff --git a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs index 930bb411e86..41b756d9aab 100644 --- a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs +++ b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/ConnectionSettingsAwareContractResolver.cs @@ -64,31 +64,31 @@ private void ApplyPropertyOverrides(MemberInfo member, JsonProperty property) private static void ApplyShouldSerializer(JsonProperty property) { - if (property.PropertyType == typeof(QueryContainer)) - property.ShouldSerialize = o => ShouldSerializeQueryContainer(o, property); - else if (property.PropertyType == typeof(IEnumerable)) - property.ShouldSerialize = o => ShouldSerializeQueryContainers(o, property); + if (property.PropertyType == typeof(Query)) + property.ShouldSerialize = o => ShouldSerializeQuery(o, property); + else if (property.PropertyType == typeof(IEnumerable)) + property.ShouldSerialize = o => ShouldSerializeQuerys(o, property); } - private static bool ShouldSerializeQueryContainer(object o, JsonProperty prop) + private static bool ShouldSerializeQuery(object o, JsonProperty prop) { if (o == null) return false; - if (prop.ValueProvider.GetValue(o) is not QueryContainer q) + if (prop.ValueProvider.GetValue(o) is not Query q) return false; //return q.IsWritable; return true; } - private static bool ShouldSerializeQueryContainers(object o, JsonProperty prop) + private static bool ShouldSerializeQuerys(object o, JsonProperty prop) { if (o == null) return false; - if (prop.ValueProvider.GetValue(o) is not IEnumerable q) + if (prop.ValueProvider.GetValue(o) is not IEnumerable q) return false; - var queryContainers = q as QueryContainer[] ?? q.ToArray(); - //return queryContainers.Any(qq => qq != null && ((QueryContainer)qq).IsWritable); + var queryContainers = q as Query[] ?? q.ToArray(); + //return queryContainers.Any(qq => qq != null && ((Query)qq).IsWritable); return queryContainers.Any(qq => qq != null); } } diff --git a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs index 05ffb3d986d..1f85d945151 100644 --- a/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs +++ b/src/Elastic.Clients.Elasticsearch.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs @@ -18,7 +18,7 @@ public class HandleNestTypesOnSourceJsonConverter : JsonConverter private static readonly HashSet NestTypesThatCanAppearInSource = new() { typeof(JoinField), - typeof(QueryContainer), + typeof(Query), //typeof(CompletionField), //typeof(Attachment), typeof(LazyJson), diff --git a/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/AsyncSearchSubmitRequest.cs b/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/SubmitAsyncSearchRequest.cs similarity index 72% rename from src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/AsyncSearchSubmitRequest.cs rename to src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/SubmitAsyncSearchRequest.cs index 9871821daf5..1292afaead1 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/AsyncSearchSubmitRequest.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/SubmitAsyncSearchRequest.cs @@ -7,22 +7,22 @@ namespace Elastic.Clients.Elasticsearch.AsyncSearch; -public partial class AsyncSearchSubmitRequest +public partial class SubmitAsyncSearchRequest { // Any request may contain aggregations so we force typed_keys in order to successfully deserialise them. internal override void BeforeRequest() => TypedKeys = true; } -public sealed partial class AsyncSearchSubmitRequestDescriptor +public sealed partial class SubmitAsyncSearchRequestDescriptor { - public AsyncSearchSubmitRequestDescriptor MatchAll(Action? selector = null) => selector is null ? Query(q => q.MatchAll()) : Query(q => q.MatchAll(selector)); + public SubmitAsyncSearchRequestDescriptor MatchAll(Action? selector = null) => selector is null ? Query(q => q.MatchAll()) : Query(q => q.MatchAll(selector)); internal override void BeforeRequest() => TypedKeys(true); } -public sealed partial class AsyncSearchSubmitRequestDescriptor +public sealed partial class SubmitAsyncSearchRequestDescriptor { - public AsyncSearchSubmitRequestDescriptor MatchAll() + public SubmitAsyncSearchRequestDescriptor MatchAll() { Query(new MatchAllQuery()); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/Api/CountRequest.cs b/src/Elastic.Clients.Elasticsearch/Api/CountRequest.cs index 4087c60138b..63dcddab77c 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/CountRequest.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/CountRequest.cs @@ -31,9 +31,9 @@ public CountRequestDescriptor Index(Indices indices) return Self; } - public CountRequestDescriptor Query(Func configure) + public CountRequestDescriptor Query(Func configure) { - var container = configure?.Invoke(new QueryContainerDescriptor()); + var container = configure?.Invoke(new QueryDescriptor()); QueryValue = container; return Self; } diff --git a/src/Elastic.Clients.Elasticsearch/Api/Eql/GetEqlResponse.cs b/src/Elastic.Clients.Elasticsearch/Api/Eql/EqlGetResponse.cs similarity index 94% rename from src/Elastic.Clients.Elasticsearch/Api/Eql/GetEqlResponse.cs rename to src/Elastic.Clients.Elasticsearch/Api/Eql/EqlGetResponse.cs index f512047e948..3b168ded56f 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/Eql/GetEqlResponse.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/Eql/EqlGetResponse.cs @@ -7,7 +7,7 @@ namespace Elastic.Clients.Elasticsearch.Eql; -public partial class GetEqlResponse +public partial class EqlGetResponse { private IReadOnlyCollection> _events; private IReadOnlyCollection> _sequences; diff --git a/src/Elastic.Clients.Elasticsearch/Api/SourceRequest.cs b/src/Elastic.Clients.Elasticsearch/Api/GetSourceRequestDescriptor.cs similarity index 50% rename from src/Elastic.Clients.Elasticsearch/Api/SourceRequest.cs rename to src/Elastic.Clients.Elasticsearch/Api/GetSourceRequestDescriptor.cs index 656e2706b6e..9c284eac810 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/SourceRequest.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/GetSourceRequestDescriptor.cs @@ -4,18 +4,12 @@ namespace Elastic.Clients.Elasticsearch; -// TODO - Should be added as a rule to the descriptor generator -//public sealed partial class SourceRequestDescriptor -//{ -// public SourceRequestDescriptor(TDocument documentWithId, IndexName index = null, Id id = null) : this(index ?? typeof(TDocument), id ?? Id.From(documentWithId)) => Doc -//} - -public partial class SourceRequestDescriptor +public partial class GetSourceRequestDescriptor { /// /// A shortcut into calling Index(typeof(TOther)). /// - public SourceRequestDescriptor Index() + public GetSourceRequestDescriptor Index() { RouteValues.Required("index", (IndexName)typeof(TOther)); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/Api/SourceResponse.cs b/src/Elastic.Clients.Elasticsearch/Api/GetSourceResponse.cs similarity index 92% rename from src/Elastic.Clients.Elasticsearch/Api/SourceResponse.cs rename to src/Elastic.Clients.Elasticsearch/Api/GetSourceResponse.cs index 4e7b2b9014c..96cfa23efe7 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/SourceResponse.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/GetSourceResponse.cs @@ -8,7 +8,7 @@ namespace Elastic.Clients.Elasticsearch; -public partial class SourceResponse : ISelfDeserializable +public partial class GetSourceResponse : ISelfDeserializable { public TDocument Body { get; set; } diff --git a/src/Elastic.Clients.Elasticsearch/Api/IndexManagement/MappingResponse.cs b/src/Elastic.Clients.Elasticsearch/Api/IndexManagement/GetMappingResponse.cs similarity index 72% rename from src/Elastic.Clients.Elasticsearch/Api/IndexManagement/MappingResponse.cs rename to src/Elastic.Clients.Elasticsearch/Api/IndexManagement/GetMappingResponse.cs index d181da29625..a66ef5fd37e 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/IndexManagement/MappingResponse.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/IndexManagement/GetMappingResponse.cs @@ -7,16 +7,16 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement; -public partial class MappingResponse +public partial class GetMappingResponse { public IReadOnlyDictionary Indices => BackingDictionary; } public static class GetMappingResponseExtensions { - public static TypeMapping GetMappingFor(this MappingResponse response) => response.GetMappingFor(typeof(T)); + public static TypeMapping GetMappingFor(this GetMappingResponse response) => response.GetMappingFor(typeof(T)); - public static TypeMapping GetMappingFor(this MappingResponse response, IndexName index) + public static TypeMapping GetMappingFor(this GetMappingResponse response, IndexName index) { if (index.IsNullOrEmpty()) return null; diff --git a/src/Elastic.Clients.Elasticsearch/Api/Sql/SqlGetAsyncResponse.cs b/src/Elastic.Clients.Elasticsearch/Api/Sql/GetAsyncResponse.cs similarity index 91% rename from src/Elastic.Clients.Elasticsearch/Api/Sql/SqlGetAsyncResponse.cs rename to src/Elastic.Clients.Elasticsearch/Api/Sql/GetAsyncResponse.cs index 227c96550c7..0ef4200ceb6 100644 --- a/src/Elastic.Clients.Elasticsearch/Api/Sql/SqlGetAsyncResponse.cs +++ b/src/Elastic.Clients.Elasticsearch/Api/Sql/GetAsyncResponse.cs @@ -7,7 +7,7 @@ namespace Elastic.Clients.Elasticsearch.Sql; -public partial class SqlGetAsyncResponse +public partial class GetAsyncResponse { [JsonInclude] [JsonPropertyName("rows")] diff --git a/src/Elastic.Clients.Elasticsearch/Core/Aggregations/AggregationCombinator.cs b/src/Elastic.Clients.Elasticsearch/Core/Aggregations/AggregationCombinator.cs index 01341e4f32e..5340fd730f4 100644 --- a/src/Elastic.Clients.Elasticsearch/Core/Aggregations/AggregationCombinator.cs +++ b/src/Elastic.Clients.Elasticsearch/Core/Aggregations/AggregationCombinator.cs @@ -10,9 +10,9 @@ namespace Elastic.Clients.Elasticsearch.Aggregations; /// /// Combines aggregations into a single list of aggregations. /// -internal class AggregationCombinator : Aggregation +internal class AggregationCombinator : SearchAggregation { - public AggregationCombinator(string name, Aggregation left, Aggregation right) + public AggregationCombinator(string name, SearchAggregation left, SearchAggregation right) { AddAggregation(left); AddAggregation(right); @@ -21,9 +21,9 @@ public AggregationCombinator(string name, Aggregation left, Aggregation right) public override string? Name { get; internal set; } - internal List Aggregations { get; } = new List(); + internal List Aggregations { get; } = new List(); - private void AddAggregation(Aggregation agg) + private void AddAggregation(SearchAggregation agg) { switch (agg) { diff --git a/src/Elastic.Clients.Elasticsearch/Core/Aggregations/AggregationDictionary.cs b/src/Elastic.Clients.Elasticsearch/Core/Aggregations/AggregationDictionary.cs index 10745b2d613..99cfa3c731a 100644 --- a/src/Elastic.Clients.Elasticsearch/Core/Aggregations/AggregationDictionary.cs +++ b/src/Elastic.Clients.Elasticsearch/Core/Aggregations/AggregationDictionary.cs @@ -11,22 +11,22 @@ namespace Elastic.Clients.Elasticsearch.Aggregations; /// /// Describes aggregations to execute as part of a search. /// -public sealed class AggregationDictionary : IsADictionary +public sealed class AggregationDictionary : IsADictionary { public AggregationDictionary() { } - public AggregationDictionary(IDictionary dictionary) + public AggregationDictionary(IDictionary dictionary) : base(dictionary.ToDictionary(kv => kv.Key, kv => kv.Value)) { } // Copy the existing dictionary rather then using the existing reference - public AggregationDictionary(Dictionary dictionary) + public AggregationDictionary(Dictionary dictionary) : base(dictionary.ToDictionary(kv => kv.Key, kv => kv.Value)) { } // Copy the existing dictionary rather then using the existing reference - public static implicit operator AggregationDictionary(Dictionary dictionary) => + public static implicit operator AggregationDictionary(Dictionary dictionary) => new(dictionary); - public static implicit operator AggregationDictionary(Aggregation aggregator) + public static implicit operator AggregationDictionary(SearchAggregation aggregator) { - Aggregation b; + SearchAggregation b; if (aggregator is AggregationCombinator combinator) { var dict = new AggregationDictionary(); @@ -49,9 +49,9 @@ public static implicit operator AggregationDictionary(Aggregation aggregator) return new AggregationDictionary { { aggregator } }; } - public void Add(string key, AggregationContainer value) => BackingDictionary.Add(ValidateKey(key), value); + public void Add(string key, Aggregation value) => BackingDictionary.Add(ValidateKey(key), value); - public void Add(AggregationContainer value) + public void Add(Aggregation value) { if (value.Variant.Name.IsNullOrEmpty()) throw new ArgumentException($"{value.GetType().Name}.Name is not set!"); diff --git a/src/Elastic.Clients.Elasticsearch/Core/Aggregations/Aggregation.cs b/src/Elastic.Clients.Elasticsearch/Core/Aggregations/SearchAggregation.cs similarity index 66% rename from src/Elastic.Clients.Elasticsearch/Core/Aggregations/Aggregation.cs rename to src/Elastic.Clients.Elasticsearch/Core/Aggregations/SearchAggregation.cs index e24c9eb2803..2dee8a6ff54 100644 --- a/src/Elastic.Clients.Elasticsearch/Core/Aggregations/Aggregation.cs +++ b/src/Elastic.Clients.Elasticsearch/Core/Aggregations/SearchAggregation.cs @@ -5,7 +5,7 @@ namespace Elastic.Clients.Elasticsearch.Aggregations; // This is marked as internal for now, until we are ready to support plugin aggregations. -internal interface IAggregation +internal interface ISearchAggregation { string? Name { get; } } @@ -13,18 +13,18 @@ internal interface IAggregation /// /// Base class for all aggregations. /// -public abstract class Aggregation : IAggregation +public abstract class SearchAggregation : ISearchAggregation { - internal Aggregation() { } + internal SearchAggregation() { } 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; + public static bool operator false(SearchAggregation _) => false; //always evaluate to false so that each side of && equation is evaluated - public static bool operator true(Aggregation _) => false; + public static bool operator true(SearchAggregation _) => false; - public static Aggregation operator &(Aggregation left, Aggregation right) => + public static SearchAggregation operator &(SearchAggregation left, SearchAggregation right) => new AggregationCombinator(null, left, right); } diff --git a/src/Elastic.Clients.Elasticsearch/Core/Extensions/Extensions.cs b/src/Elastic.Clients.Elasticsearch/Core/Extensions/Extensions.cs index f86265233ce..fb8fe3d900f 100644 --- a/src/Elastic.Clients.Elasticsearch/Core/Extensions/Extensions.cs +++ b/src/Elastic.Clients.Elasticsearch/Core/Extensions/Extensions.cs @@ -19,9 +19,9 @@ internal static class Extensions { private static readonly ConcurrentDictionary EnumCache = new(); - //internal static bool NotWritable(this QueryContainer q) => q == null || !q.IsWritable; + //internal static bool NotWritable(this Query q) => q == null || !q.IsWritable; - //internal static bool NotWritable(this IEnumerable qs) => qs == null || qs.All(q => q.NotWritable()); + //internal static bool NotWritable(this IEnumerable qs) => qs == null || qs.All(q => q.NotWritable()); internal static string ToEnumValue(this T enumValue) where T : struct { diff --git a/src/Elastic.Clients.Elasticsearch/Core/Query/Query.cs b/src/Elastic.Clients.Elasticsearch/Core/Query/Query.cs index 659d94cbc4d..7a1ad4cdd44 100644 --- a/src/Elastic.Clients.Elasticsearch/Core/Query/Query.cs +++ b/src/Elastic.Clients.Elasticsearch/Core/Query/Query.cs @@ -4,7 +4,7 @@ namespace Elastic.Clients.Elasticsearch.QueryDsl; -public abstract partial class Query +public abstract partial class SearchQuery { //[JsonIgnore] //public bool IsWritable => throw new NotImplementedException(); @@ -22,10 +22,10 @@ public abstract partial class Query //bool IQuery.Conditionless => Conditionless; //always evaluate to false so that each side of && equation is evaluated - public static bool operator false(Query a) => false; + public static bool operator false(SearchQuery a) => false; //always evaluate to false so that each side of && equation is evaluated - public static bool operator true(Query a) => false; + public static bool operator true(SearchQuery a) => false; //public static QueryBase operator &(QueryBase leftQuery, QueryBase rightQuery) => Combine(leftQuery, rightQuery, (l, r) => l && r); @@ -33,18 +33,18 @@ public abstract partial class Query //public static QueryBase operator !(QueryBase query) => query == null || !query.IsWritable // ? null - // : new BoolQuery { MustNot = new QueryContainer[] { query } }; + // : new BoolQuery { MustNot = new Query[] { query } }; //public static QueryBase operator +(QueryBase query) => query == null || !query.IsWritable // ? null - // : new BoolQuery { Filter = new QueryContainer[] { query } }; + // : new BoolQuery { Filter = new Query[] { query } }; - //private static QueryBase Combine(QueryBase leftQuery, QueryBase rightQuery, Func combine) + //private static QueryBase Combine(QueryBase leftQuery, QueryBase rightQuery, Func combine) //{ // if (IfEitherIsEmptyReturnTheOtherOrEmpty(leftQuery, rightQuery, out var q)) // return q; - // IQueryContainer container = combine(leftQuery, rightQuery); + // IQuery container = combine(leftQuery, rightQuery); // var query = container.Bool; // return new BoolQuery // { @@ -73,13 +73,13 @@ public abstract partial class Query // return true; //} - //public static implicit operator QueryContainer(QueryBase query) => - // query == null ? null : new QueryContainer(query); + //public static implicit operator Query(QueryBase query) => + // query == null ? null : new Query(query); - //internal void WrapInContainer(IQueryContainer container) => InternalWrapInContainer(container); + //internal void WrapInContainer(IQuery container) => InternalWrapInContainer(container); ////container.IsVerbatim = IsVerbatim; ////container.IsStrict = IsStrict; - //internal abstract void InternalWrapInContainer(IQueryContainer container); + //internal abstract void InternalWrapInContainer(IQuery container); } diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/AggregationContainerSerializationHelper.cs b/src/Elastic.Clients.Elasticsearch/Serialization/AggregationSerializationHelper.cs similarity index 53% rename from src/Elastic.Clients.Elasticsearch/Serialization/AggregationContainerSerializationHelper.cs rename to src/Elastic.Clients.Elasticsearch/Serialization/AggregationSerializationHelper.cs index 9c7d6209aa8..01caf035b19 100644 --- a/src/Elastic.Clients.Elasticsearch/Serialization/AggregationContainerSerializationHelper.cs +++ b/src/Elastic.Clients.Elasticsearch/Serialization/AggregationSerializationHelper.cs @@ -7,24 +7,24 @@ namespace Elastic.Clients.Elasticsearch.Serialization; -internal static class AggregationContainerSerializationHelper +internal static class AggregationSerializationHelper { - public static AggregationContainer ReadContainer(ref Utf8JsonReader reader, JsonSerializerOptions options) where T : Aggregation + public static Aggregation ReadContainer(ref Utf8JsonReader reader, JsonSerializerOptions options) where T : SearchAggregation { var variant = JsonSerializer.Deserialize(ref reader, options); - var container = new AggregationContainer(variant); + var container = new Aggregation(variant); return container; } - public static AggregationContainer ReadContainer(string variantName, ref Utf8JsonReader reader, JsonSerializerOptions options) where T : Aggregation + public static Aggregation ReadContainer(string variantName, ref Utf8JsonReader reader, JsonSerializerOptions options) where T : SearchAggregation { var variant = JsonSerializer.Deserialize(ref reader, options); - var container = new AggregationContainer(variant); + var container = new Aggregation(variant); - if (container.Variant is Aggregation agg) + if (container.Variant is SearchAggregation agg) agg.Name = variantName; return container; diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/ResponseItemConverterFactory.cs b/src/Elastic.Clients.Elasticsearch/Serialization/ResponseItemConverterFactory.cs index 201e09af4ab..aebec65ae42 100644 --- a/src/Elastic.Clients.Elasticsearch/Serialization/ResponseItemConverterFactory.cs +++ b/src/Elastic.Clients.Elasticsearch/Serialization/ResponseItemConverterFactory.cs @@ -11,11 +11,11 @@ namespace Elastic.Clients.Elasticsearch.Serialization; /// -/// A converter factory able to provide a converter to handle (de)serializing . +/// A converter factory able to provide a converter to handle (de)serializing . /// internal sealed class ResponseItemConverterFactory : JsonConverterFactory { - public override bool CanConvert(Type typeToConvert) => typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(ResponseItem<>); + public override bool CanConvert(Type typeToConvert) => typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(MultiGetResponseItem<>); public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) { @@ -25,9 +25,9 @@ internal sealed class ResponseItemConverterFactory : JsonConverterFactory typeof(ResponseItemConverter<>).MakeGenericType(documentType)); } - private sealed class ResponseItemConverter : JsonConverter> + private sealed class ResponseItemConverter : JsonConverter> { - public override ResponseItem? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override MultiGetResponseItem? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { const string exceptionMessage = "Unable to deserialize union."; var readerCopy = reader; @@ -46,7 +46,7 @@ private sealed class ResponseItemConverter : JsonConverter(result); + return new MultiGetResponseItem(result); } } catch (Exception ex) @@ -60,7 +60,7 @@ private sealed class ResponseItemConverter : JsonConverter(result); + return new MultiGetResponseItem(result); } } catch (Exception ex) @@ -92,7 +92,7 @@ private sealed class ResponseItemConverter : JsonConverter value, JsonSerializerOptions options) => - throw new NotImplementedException("We never expect to serialize an instance of ResponseItem as its a read-only response type."); + public override void Write(Utf8JsonWriter writer, MultiGetResponseItem value, JsonSerializerOptions options) => + throw new NotImplementedException("We never expect to serialize an instance of MultiGetResponseItem as its a read-only response type."); } } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainer.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/Aggregation.cs similarity index 62% rename from src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainer.cs rename to src/Elastic.Clients.Elasticsearch/Types/Aggregations/Aggregation.cs index 42c26fa23ef..4799bdde9ad 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainer.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/Aggregation.cs @@ -7,17 +7,17 @@ namespace Elastic.Clients.Elasticsearch.Aggregations; -public partial class AggregationContainer +public partial class Aggregation { internal string ContainedVariantName { get; set; } internal Action SerializeFluent { get; private set; } - private AggregationContainer(string variant) => ContainedVariantName = variant; + private Aggregation(string variant) => ContainedVariantName = variant; - internal static AggregationContainer CreateWithAction(string variantName, Action configure) where T : new() + internal static Aggregation CreateWithAction(string variantName, Action configure) where T : new() { - var container = new AggregationContainer(variantName); + var container = new Aggregation(variantName); container.SetAction(configure); return container; } @@ -30,6 +30,6 @@ public partial class AggregationContainer JsonSerializer.Serialize(writer, descriptor, options); }; - public static implicit operator AggregationContainer(Aggregation aggregator) => - aggregator == null ? null : new AggregationContainer(aggregator); + public static implicit operator Aggregation(SearchAggregation aggregator) => + aggregator == null ? null : new Aggregation(aggregator); } diff --git a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainerDescriptor.cs b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationDescriptor.cs similarity index 77% rename from src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainerDescriptor.cs rename to src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationDescriptor.cs index b14673eeb68..3f59447a495 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationContainerDescriptor.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/Aggregations/AggregationDescriptor.cs @@ -6,11 +6,11 @@ namespace Elastic.Clients.Elasticsearch.Aggregations; -public partial class AggregationContainerDescriptor +public partial class AggregationDescriptor { internal AggregationDictionary Aggregations { get; set; } - private AggregationContainerDescriptor SetContainer(string key, AggregationContainer container) + private AggregationDescriptor SetContainer(string key, Aggregation container) { if (Self.Aggregations == null) Self.Aggregations = new AggregationDictionary(); @@ -23,11 +23,11 @@ private AggregationContainerDescriptor SetContainer(string key, Aggre protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) => JsonSerializer.Serialize(writer, Aggregations, options); } -public partial class AggregationContainerDescriptor +public partial class AggregationDescriptor { internal AggregationDictionary Aggregations { get; set; } - private AggregationContainerDescriptor SetContainer(string key, AggregationContainer container) + private AggregationDescriptor SetContainer(string key, Aggregation container) { if (Self.Aggregations == null) Self.Aggregations = new AggregationDictionary(); diff --git a/src/Elastic.Clients.Elasticsearch/Types/QueryDsl/QueryContainerDescriptor.cs b/src/Elastic.Clients.Elasticsearch/Types/QueryDsl/QueryDescriptor.cs similarity index 69% rename from src/Elastic.Clients.Elasticsearch/Types/QueryDsl/QueryContainerDescriptor.cs rename to src/Elastic.Clients.Elasticsearch/Types/QueryDsl/QueryDescriptor.cs index f68582497ea..911c0e2d149 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/QueryDsl/QueryContainerDescriptor.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/QueryDsl/QueryDescriptor.cs @@ -7,7 +7,7 @@ namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class QueryContainerDescriptor +public sealed partial class QueryDescriptor { public void MatchAll() => Set(_ => { }, "match_all"); @@ -16,16 +16,11 @@ public void Term(Expression> field, object value Term(t => t.Field(field).Value(FieldValue.Composite(value)).Boost(boost)); } -public sealed partial class QueryContainerDescriptor/**/ +public sealed partial class QueryDescriptor { public void MatchAll() => Set(_ => { }, "match_all"); - // TODO - NAME IS MISSING - - //public void Term(Expression> field, object value, float? boost = null, string name = null) => - // Term(t => t.Field(field).Value(value).Boost(boost).Name(name)); - public void Term(Expression> field, object value, float? boost = null) => Term(t => t.Field(field).Value(FieldValue.Composite(value)).Boost(boost)); } diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs index f1114f63791..cb98d993862 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs @@ -19,9 +19,9 @@ namespace Elastic.Clients.Elasticsearch.Requests; internal static class ApiUrlsLookups { internal static ApiUrls AsyncSearchStatus = new ApiUrls(new[] { "/_async_search/status/{id}" }); - internal static ApiUrls AsyncSearchSubmit = new ApiUrls(new[] { "/_async_search", "/{index}/_async_search" }); internal static ApiUrls AsyncSearchDelete = new ApiUrls(new[] { "/_async_search/{id}" }); internal static ApiUrls AsyncSearchGet = new ApiUrls(new[] { "/_async_search/{id}" }); + internal static ApiUrls AsyncSearchSubmit = new ApiUrls(new[] { "/_async_search", "/{index}/_async_search" }); internal static ApiUrls NoNamespaceBulk = new ApiUrls(new[] { "/_bulk", "/{index}/_bulk" }); internal static ApiUrls NoNamespaceClearScroll = new ApiUrls(new[] { "/_search/scroll" }); internal static ApiUrls NoNamespaceClosePointInTime = new ApiUrls(new[] { "/_pit" }); @@ -33,35 +33,41 @@ internal static class ApiUrlsLookups internal static ApiUrls NoNamespaceDelete = new ApiUrls(new[] { "/{index}/_doc/{id}" }); internal static ApiUrls NoNamespaceDeleteScript = new ApiUrls(new[] { "/_scripts/{id}" }); internal static ApiUrls EqlDelete = new ApiUrls(new[] { "/_eql/search/{id}" }); - internal static ApiUrls EqlGetStatus = new ApiUrls(new[] { "/_eql/search/status/{id}" }); - internal static ApiUrls EqlSearch = new ApiUrls(new[] { "/{index}/_eql/search" }); internal static ApiUrls EqlGet = new ApiUrls(new[] { "/_eql/search/{id}" }); + internal static ApiUrls EqlSearch = new ApiUrls(new[] { "/{index}/_eql/search" }); + internal static ApiUrls EqlGetStatus = new ApiUrls(new[] { "/_eql/search/status/{id}" }); internal static ApiUrls NoNamespaceExists = new ApiUrls(new[] { "/{index}/_doc/{id}" }); internal static ApiUrls NoNamespaceExistsSource = new ApiUrls(new[] { "/{index}/_source/{id}" }); internal static ApiUrls NoNamespaceExplain = new ApiUrls(new[] { "/{index}/_explain/{id}" }); internal static ApiUrls NoNamespaceFieldCaps = new ApiUrls(new[] { "/_field_caps", "/{index}/_field_caps" }); internal static ApiUrls NoNamespaceGet = new ApiUrls(new[] { "/{index}/_doc/{id}" }); - internal static ApiUrls IndexManagementGetAlias = new ApiUrls(new[] { "/_alias", "/_alias/{name}", "/{index}/_alias/{name}", "/{index}/_alias" }); + internal static ApiUrls NoNamespaceGetScriptContext = new ApiUrls(new[] { "/_script_context" }); + internal static ApiUrls NoNamespaceGetScriptLanguages = new ApiUrls(new[] { "/_script_language" }); + internal static ApiUrls NoNamespaceGetScript = new ApiUrls(new[] { "/_scripts/{id}" }); + internal static ApiUrls NoNamespaceGetSource = new ApiUrls(new[] { "/{index}/_source/{id}" }); internal static ApiUrls IndexManagementClone = new ApiUrls(new[] { "/{index}/_clone/{target}" }); internal static ApiUrls IndexManagementClose = new ApiUrls(new[] { "/{index}/_close" }); internal static ApiUrls IndexManagementCreateDataStream = new ApiUrls(new[] { "/_data_stream/{name}" }); internal static ApiUrls IndexManagementCreate = new ApiUrls(new[] { "/{index}" }); - internal static ApiUrls IndexManagementGetDataStream = new ApiUrls(new[] { "/_data_stream", "/_data_stream/{name}" }); internal static ApiUrls IndexManagementDeleteAlias = new ApiUrls(new[] { "/{index}/_alias/{name}" }); internal static ApiUrls IndexManagementDeleteDataStream = new ApiUrls(new[] { "/_data_stream/{name}" }); - internal static ApiUrls IndexManagementDeleteIndexTemplate = new ApiUrls(new[] { "/_index_template/{name}" }); internal static ApiUrls IndexManagementDelete = new ApiUrls(new[] { "/{index}" }); + internal static ApiUrls IndexManagementDeleteIndexTemplate = new ApiUrls(new[] { "/_index_template/{name}" }); internal static ApiUrls IndexManagementDeleteTemplate = new ApiUrls(new[] { "/_template/{name}" }); internal static ApiUrls IndexManagementExistsAlias = new ApiUrls(new[] { "/_alias/{name}", "/{index}/_alias/{name}" }); internal static ApiUrls IndexManagementExistsIndexTemplate = new ApiUrls(new[] { "/_index_template/{name}" }); internal static ApiUrls IndexManagementExists = new ApiUrls(new[] { "/{index}" }); internal static ApiUrls IndexManagementExistsTemplate = new ApiUrls(new[] { "/_template/{name}" }); - internal static ApiUrls IndexManagementGetFieldMapping = new ApiUrls(new[] { "/_mapping/field/{fields}", "/{index}/_mapping/field/{fields}" }); internal static ApiUrls IndexManagementFlush = new ApiUrls(new[] { "/_flush", "/{index}/_flush" }); internal static ApiUrls IndexManagementForcemerge = new ApiUrls(new[] { "/_forcemerge", "/{index}/_forcemerge" }); + internal static ApiUrls IndexManagementGetAlias = new ApiUrls(new[] { "/_alias", "/_alias/{name}", "/{index}/_alias/{name}", "/{index}/_alias" }); + internal static ApiUrls IndexManagementGetDataStream = new ApiUrls(new[] { "/_data_stream", "/_data_stream/{name}" }); + internal static ApiUrls IndexManagementGetFieldMapping = new ApiUrls(new[] { "/_mapping/field/{fields}", "/{index}/_mapping/field/{fields}" }); internal static ApiUrls IndexManagementGet = new ApiUrls(new[] { "/{index}" }); internal static ApiUrls IndexManagementGetIndexTemplate = new ApiUrls(new[] { "/_index_template", "/_index_template/{name}" }); internal static ApiUrls IndexManagementGetMapping = new ApiUrls(new[] { "/_mapping", "/{index}/_mapping" }); + internal static ApiUrls IndexManagementGetTemplate = new ApiUrls(new[] { "/_template", "/_template/{name}" }); + internal static ApiUrls IndexManagementStats = new ApiUrls(new[] { "/_stats", "/_stats/{metric}", "/{index}/_stats", "/{index}/_stats/{metric}" }); internal static ApiUrls IndexManagementMigrateToDataStream = new ApiUrls(new[] { "/_data_stream/_migrate/{name}" }); internal static ApiUrls IndexManagementOpen = new ApiUrls(new[] { "/{index}/_open" }); internal static ApiUrls IndexManagementPutAlias = new ApiUrls(new[] { "/{index}/_alias/{name}" }); @@ -74,8 +80,6 @@ internal static class ApiUrlsLookups internal static ApiUrls IndexManagementSimulateIndexTemplate = new ApiUrls(new[] { "/_index_template/_simulate_index/{name}" }); internal static ApiUrls IndexManagementSimulateTemplate = new ApiUrls(new[] { "/_index_template/_simulate", "/_index_template/_simulate/{name}" }); internal static ApiUrls IndexManagementSplit = new ApiUrls(new[] { "/{index}/_split/{target}" }); - internal static ApiUrls IndexManagementStats = new ApiUrls(new[] { "/_stats", "/_stats/{metric}", "/{index}/_stats", "/{index}/_stats/{metric}" }); - internal static ApiUrls IndexManagementGetTemplate = new ApiUrls(new[] { "/_template", "/_template/{name}" }); internal static ApiUrls NoNamespaceIndex = new ApiUrls(new[] { "/{index}/_doc/{id}", "/{index}/_doc" }); internal static ApiUrls NoNamespaceInfo = new ApiUrls(new[] { "/" }); internal static ApiUrls NoNamespaceMget = new ApiUrls(new[] { "/_mget", "/{index}/_mget" }); @@ -87,13 +91,9 @@ internal static class ApiUrlsLookups internal static ApiUrls NoNamespaceRankEval = new ApiUrls(new[] { "/_rank_eval", "/{index}/_rank_eval" }); internal static ApiUrls NoNamespaceReindex = new ApiUrls(new[] { "/_reindex" }); internal static ApiUrls NoNamespaceReindexRethrottle = new ApiUrls(new[] { "/_reindex/{task_id}/_rethrottle" }); - internal static ApiUrls NoNamespaceGetScriptContext = new ApiUrls(new[] { "/_script_context" }); - internal static ApiUrls NoNamespaceGetScriptLanguages = new ApiUrls(new[] { "/_script_language" }); - internal static ApiUrls NoNamespaceGetScript = new ApiUrls(new[] { "/_scripts/{id}" }); internal static ApiUrls NoNamespaceScroll = new ApiUrls(new[] { "/_search/scroll" }); internal static ApiUrls NoNamespaceSearch = new ApiUrls(new[] { "/_search", "/{index}/_search" }); internal static ApiUrls NoNamespaceSearchShards = new ApiUrls(new[] { "/_search_shards", "/{index}/_search_shards" }); - internal static ApiUrls NoNamespaceGetSource = new ApiUrls(new[] { "/{index}/_source/{id}" }); internal static ApiUrls SqlClearCursor = new ApiUrls(new[] { "/_sql/close" }); internal static ApiUrls SqlDeleteAsync = new ApiUrls(new[] { "/_sql/async/delete/{id}" }); internal static ApiUrls SqlGetAsync = new ApiUrls(new[] { "/_sql/async/{id}" }); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs similarity index 82% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs index 88fe49450c8..bd80719e035 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.AsyncSearch; -public sealed class AsyncSearchSubmitRequestParameters : RequestParameters +public sealed class SubmitAsyncSearchRequestParameters : RequestParameters { [JsonIgnore] public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); } @@ -126,13 +126,13 @@ public sealed class AsyncSearchSubmitRequestParameters : RequestParameters public string? QueryLuceneSyntax { get => Q("q"); set => Q("q", value); } } -internal sealed class AsyncSearchSubmitRequestConverter : JsonConverter +internal sealed class SubmitAsyncSearchRequestConverter : JsonConverter { - public override AsyncSearchSubmitRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override SubmitAsyncSearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType != JsonTokenType.StartObject) throw new JsonException("Unexpected JSON detected."); - var variant = new AsyncSearchSubmitRequest(); + var variant = new SubmitAsyncSearchRequest(); while (reader.Read() && reader.TokenType != JsonTokenType.EndObject) { if (reader.TokenType == JsonTokenType.PropertyName) @@ -206,7 +206,7 @@ public override AsyncSearchSubmitRequest Read(ref Utf8JsonReader reader, Type ty if (property == "post_filter") { - variant.PostFilter = JsonSerializer.Deserialize(ref reader, options); + variant.PostFilter = JsonSerializer.Deserialize(ref reader, options); continue; } @@ -218,7 +218,7 @@ public override AsyncSearchSubmitRequest Read(ref Utf8JsonReader reader, Type ty if (property == "query") { - variant.Query = JsonSerializer.Deserialize(ref reader, options); + variant.Query = JsonSerializer.Deserialize(ref reader, options); continue; } @@ -335,7 +335,7 @@ public override AsyncSearchSubmitRequest Read(ref Utf8JsonReader reader, Type ty return variant; } - public override void Write(Utf8JsonWriter writer, AsyncSearchSubmitRequest value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, SubmitAsyncSearchRequest value, JsonSerializerOptions options) { writer.WriteStartObject(); if (value.Aggregations is not null) @@ -534,14 +534,14 @@ public override void Write(Utf8JsonWriter writer, AsyncSearchSubmitRequest value } } -[JsonConverter(typeof(AsyncSearchSubmitRequestConverter))] -public partial class AsyncSearchSubmitRequest : PlainRequest +[JsonConverter(typeof(SubmitAsyncSearchRequestConverter))] +public sealed partial class SubmitAsyncSearchRequest : PlainRequest { - public AsyncSearchSubmitRequest() + public SubmitAsyncSearchRequest() { } - public AsyncSearchSubmitRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } @@ -690,7 +690,7 @@ public AsyncSearchSubmitRequest(Elastic.Clients.Elasticsearch.Indices? indices) [JsonInclude] [JsonPropertyName("post_filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilter { get; set; } [JsonInclude] [JsonPropertyName("profile")] @@ -698,7 +698,7 @@ public AsyncSearchSubmitRequest(Elastic.Clients.Elasticsearch.Indices? indices) [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } [JsonInclude] [JsonPropertyName("rescore")] @@ -774,56 +774,49 @@ public AsyncSearchSubmitRequest(Elastic.Clients.Elasticsearch.Indices? indices) public ICollection? Stats { get; set; } } -public sealed partial class AsyncSearchSubmitRequest : AsyncSearchSubmitRequest +public sealed partial class SubmitAsyncSearchRequestDescriptor : RequestDescriptor, SubmitAsyncSearchRequestParameters> { - public AsyncSearchSubmitRequest() : base(typeof(TInferDocument)) - { - } -} - -public sealed partial class AsyncSearchSubmitRequestDescriptor : RequestDescriptor, AsyncSearchSubmitRequestParameters> -{ - internal AsyncSearchSubmitRequestDescriptor(Action> configure) => configure.Invoke(this); - public AsyncSearchSubmitRequestDescriptor() + internal SubmitAsyncSearchRequestDescriptor(Action> configure) => configure.Invoke(this); + public SubmitAsyncSearchRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchSubmit; internal override HttpMethod HttpMethod => HttpMethod.POST; internal override bool SupportsBody => true; - public AsyncSearchSubmitRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes); - public AsyncSearchSubmitRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes); - public AsyncSearchSubmitRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public AsyncSearchSubmitRequestDescriptor AllowPartialSearchResults(bool? allowPartialSearchResults = true) => Qs("allow_partial_search_results", allowPartialSearchResults); - public AsyncSearchSubmitRequestDescriptor AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard); - public AsyncSearchSubmitRequestDescriptor Analyzer(string? analyzer) => Qs("analyzer", analyzer); - public AsyncSearchSubmitRequestDescriptor BatchedReduceSize(long? batchedReduceSize) => Qs("batched_reduce_size", batchedReduceSize); - public AsyncSearchSubmitRequestDescriptor CcsMinimizeRoundtrips(bool? ccsMinimizeRoundtrips = true) => Qs("ccs_minimize_roundtrips", ccsMinimizeRoundtrips); - public AsyncSearchSubmitRequestDescriptor DefaultOperator(Elastic.Clients.Elasticsearch.QueryDsl.Operator? defaultOperator) => Qs("default_operator", defaultOperator); - public AsyncSearchSubmitRequestDescriptor Df(string? df) => Qs("df", df); - public AsyncSearchSubmitRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public AsyncSearchSubmitRequestDescriptor IgnoreThrottled(bool? ignoreThrottled = true) => Qs("ignore_throttled", ignoreThrottled); - public AsyncSearchSubmitRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public AsyncSearchSubmitRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); - public AsyncSearchSubmitRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true) => Qs("keep_on_completion", keepOnCompletion); - public AsyncSearchSubmitRequestDescriptor Lenient(bool? lenient = true) => Qs("lenient", lenient); - public AsyncSearchSubmitRequestDescriptor MaxConcurrentShardRequests(long? maxConcurrentShardRequests) => Qs("max_concurrent_shard_requests", maxConcurrentShardRequests); - public AsyncSearchSubmitRequestDescriptor MinCompatibleShardNode(string? minCompatibleShardNode) => Qs("min_compatible_shard_node", minCompatibleShardNode); - public AsyncSearchSubmitRequestDescriptor PreFilterShardSize(long? preFilterShardSize) => Qs("pre_filter_shard_size", preFilterShardSize); - public AsyncSearchSubmitRequestDescriptor Preference(string? preference) => Qs("preference", preference); - public AsyncSearchSubmitRequestDescriptor QueryLuceneSyntax(string? q) => Qs("q", q); - public AsyncSearchSubmitRequestDescriptor RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache); - public AsyncSearchSubmitRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt); - public AsyncSearchSubmitRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing); - public AsyncSearchSubmitRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll); - public AsyncSearchSubmitRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType); - public AsyncSearchSubmitRequestDescriptor SuggestField(Elastic.Clients.Elasticsearch.Field? suggestField) => Qs("suggest_field", suggestField); - public AsyncSearchSubmitRequestDescriptor SuggestMode(Elastic.Clients.Elasticsearch.SuggestMode? suggestMode) => Qs("suggest_mode", suggestMode); - public AsyncSearchSubmitRequestDescriptor SuggestSize(long? suggestSize) => Qs("suggest_size", suggestSize); - public AsyncSearchSubmitRequestDescriptor SuggestText(string? suggestText) => Qs("suggest_text", suggestText); - public AsyncSearchSubmitRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys); - public AsyncSearchSubmitRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); - public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public SubmitAsyncSearchRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes); + public SubmitAsyncSearchRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes); + public SubmitAsyncSearchRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public SubmitAsyncSearchRequestDescriptor AllowPartialSearchResults(bool? allowPartialSearchResults = true) => Qs("allow_partial_search_results", allowPartialSearchResults); + public SubmitAsyncSearchRequestDescriptor AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard); + public SubmitAsyncSearchRequestDescriptor Analyzer(string? analyzer) => Qs("analyzer", analyzer); + public SubmitAsyncSearchRequestDescriptor BatchedReduceSize(long? batchedReduceSize) => Qs("batched_reduce_size", batchedReduceSize); + public SubmitAsyncSearchRequestDescriptor CcsMinimizeRoundtrips(bool? ccsMinimizeRoundtrips = true) => Qs("ccs_minimize_roundtrips", ccsMinimizeRoundtrips); + public SubmitAsyncSearchRequestDescriptor DefaultOperator(Elastic.Clients.Elasticsearch.QueryDsl.Operator? defaultOperator) => Qs("default_operator", defaultOperator); + public SubmitAsyncSearchRequestDescriptor Df(string? df) => Qs("df", df); + public SubmitAsyncSearchRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public SubmitAsyncSearchRequestDescriptor IgnoreThrottled(bool? ignoreThrottled = true) => Qs("ignore_throttled", ignoreThrottled); + public SubmitAsyncSearchRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public SubmitAsyncSearchRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); + public SubmitAsyncSearchRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true) => Qs("keep_on_completion", keepOnCompletion); + public SubmitAsyncSearchRequestDescriptor Lenient(bool? lenient = true) => Qs("lenient", lenient); + public SubmitAsyncSearchRequestDescriptor MaxConcurrentShardRequests(long? maxConcurrentShardRequests) => Qs("max_concurrent_shard_requests", maxConcurrentShardRequests); + public SubmitAsyncSearchRequestDescriptor MinCompatibleShardNode(string? minCompatibleShardNode) => Qs("min_compatible_shard_node", minCompatibleShardNode); + public SubmitAsyncSearchRequestDescriptor PreFilterShardSize(long? preFilterShardSize) => Qs("pre_filter_shard_size", preFilterShardSize); + public SubmitAsyncSearchRequestDescriptor Preference(string? preference) => Qs("preference", preference); + public SubmitAsyncSearchRequestDescriptor QueryLuceneSyntax(string? q) => Qs("q", q); + public SubmitAsyncSearchRequestDescriptor RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache); + public SubmitAsyncSearchRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt); + public SubmitAsyncSearchRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing); + public SubmitAsyncSearchRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll); + public SubmitAsyncSearchRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType); + public SubmitAsyncSearchRequestDescriptor SuggestField(Elastic.Clients.Elasticsearch.Field? suggestField) => Qs("suggest_field", suggestField); + public SubmitAsyncSearchRequestDescriptor SuggestMode(Elastic.Clients.Elasticsearch.SuggestMode? suggestMode) => Qs("suggest_mode", suggestMode); + public SubmitAsyncSearchRequestDescriptor SuggestSize(long? suggestSize) => Qs("suggest_size", suggestSize); + public SubmitAsyncSearchRequestDescriptor SuggestText(string? suggestText) => Qs("suggest_text", suggestText); + public SubmitAsyncSearchRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys); + public SubmitAsyncSearchRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); + public SubmitAsyncSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; @@ -831,9 +824,9 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Ela private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; } @@ -869,17 +862,17 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Ela private Action> KnnDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor PostFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; } - private Action> PostFilterDescriptorAction { get; set; } + private Action> PostFilterDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private ICollection? RescoreValue { get; set; } @@ -953,7 +946,7 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Ela private bool? VersionValue { get; set; } - public AsyncSearchSubmitRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations) + public SubmitAsyncSearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations) { AggregationsDescriptor = null; AggregationsDescriptorAction = null; @@ -961,7 +954,7 @@ public AsyncSearchSubmitRequestDescriptor Aggregations(Elastic.Client return Self; } - public AsyncSearchSubmitRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -969,7 +962,7 @@ public AsyncSearchSubmitRequestDescriptor Aggregations(Elastic.Client return Self; } - public AsyncSearchSubmitRequestDescriptor Aggregations(Action> configure) + public SubmitAsyncSearchRequestDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -977,7 +970,7 @@ public AsyncSearchSubmitRequestDescriptor Aggregations(Action Collapse(Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? collapse) + public SubmitAsyncSearchRequestDescriptor Collapse(Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? collapse) { CollapseDescriptor = null; CollapseDescriptorAction = null; @@ -985,7 +978,7 @@ public AsyncSearchSubmitRequestDescriptor Collapse(Elastic.Clients.El return Self; } - public AsyncSearchSubmitRequestDescriptor Collapse(Core.Search.FieldCollapseDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Collapse(Core.Search.FieldCollapseDescriptor descriptor) { CollapseValue = null; CollapseDescriptorAction = null; @@ -993,7 +986,7 @@ public AsyncSearchSubmitRequestDescriptor Collapse(Core.Search.FieldC return Self; } - public AsyncSearchSubmitRequestDescriptor Collapse(Action> configure) + public SubmitAsyncSearchRequestDescriptor Collapse(Action> configure) { CollapseValue = null; CollapseDescriptor = null; @@ -1001,7 +994,7 @@ public AsyncSearchSubmitRequestDescriptor Collapse(Action DocvalueFields(ICollection? docvalueFields) + public SubmitAsyncSearchRequestDescriptor DocvalueFields(ICollection? docvalueFields) { DocvalueFieldsDescriptor = null; DocvalueFieldsDescriptorAction = null; @@ -1010,7 +1003,7 @@ public AsyncSearchSubmitRequestDescriptor DocvalueFields(ICollection< return Self; } - public AsyncSearchSubmitRequestDescriptor DocvalueFields(QueryDsl.FieldAndFormatDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor DocvalueFields(QueryDsl.FieldAndFormatDescriptor descriptor) { DocvalueFieldsValue = null; DocvalueFieldsDescriptorAction = null; @@ -1019,7 +1012,7 @@ public AsyncSearchSubmitRequestDescriptor DocvalueFields(QueryDsl.Fie return Self; } - public AsyncSearchSubmitRequestDescriptor DocvalueFields(Action> configure) + public SubmitAsyncSearchRequestDescriptor DocvalueFields(Action> configure) { DocvalueFieldsValue = null; DocvalueFieldsDescriptor = null; @@ -1028,7 +1021,7 @@ public AsyncSearchSubmitRequestDescriptor DocvalueFields(Action DocvalueFields(params Action>[] configure) + public SubmitAsyncSearchRequestDescriptor DocvalueFields(params Action>[] configure) { DocvalueFieldsValue = null; DocvalueFieldsDescriptor = null; @@ -1037,7 +1030,7 @@ public AsyncSearchSubmitRequestDescriptor DocvalueFields(params Actio return Self; } - public AsyncSearchSubmitRequestDescriptor Fields(ICollection? fields) + public SubmitAsyncSearchRequestDescriptor Fields(ICollection? fields) { FieldsDescriptor = null; FieldsDescriptorAction = null; @@ -1046,7 +1039,7 @@ public AsyncSearchSubmitRequestDescriptor Fields(ICollection Fields(QueryDsl.FieldAndFormatDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Fields(QueryDsl.FieldAndFormatDescriptor descriptor) { FieldsValue = null; FieldsDescriptorAction = null; @@ -1055,7 +1048,7 @@ public AsyncSearchSubmitRequestDescriptor Fields(QueryDsl.FieldAndFor return Self; } - public AsyncSearchSubmitRequestDescriptor Fields(Action> configure) + public SubmitAsyncSearchRequestDescriptor Fields(Action> configure) { FieldsValue = null; FieldsDescriptor = null; @@ -1064,7 +1057,7 @@ public AsyncSearchSubmitRequestDescriptor Fields(Action Fields(params Action>[] configure) + public SubmitAsyncSearchRequestDescriptor Fields(params Action>[] configure) { FieldsValue = null; FieldsDescriptor = null; @@ -1073,7 +1066,7 @@ public AsyncSearchSubmitRequestDescriptor Fields(params Action Highlight(Elastic.Clients.Elasticsearch.Core.Search.Highlight? highlight) + public SubmitAsyncSearchRequestDescriptor Highlight(Elastic.Clients.Elasticsearch.Core.Search.Highlight? highlight) { HighlightDescriptor = null; HighlightDescriptorAction = null; @@ -1081,7 +1074,7 @@ public AsyncSearchSubmitRequestDescriptor Highlight(Elastic.Clients.E return Self; } - public AsyncSearchSubmitRequestDescriptor Highlight(Core.Search.HighlightDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Highlight(Core.Search.HighlightDescriptor descriptor) { HighlightValue = null; HighlightDescriptorAction = null; @@ -1089,7 +1082,7 @@ public AsyncSearchSubmitRequestDescriptor Highlight(Core.Search.Highl return Self; } - public AsyncSearchSubmitRequestDescriptor Highlight(Action> configure) + public SubmitAsyncSearchRequestDescriptor Highlight(Action> configure) { HighlightValue = null; HighlightDescriptor = null; @@ -1097,7 +1090,7 @@ public AsyncSearchSubmitRequestDescriptor Highlight(Action Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn) + public SubmitAsyncSearchRequestDescriptor Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn) { KnnDescriptor = null; KnnDescriptorAction = null; @@ -1105,7 +1098,7 @@ public AsyncSearchSubmitRequestDescriptor Knn(Elastic.Clients.Elastic return Self; } - public AsyncSearchSubmitRequestDescriptor Knn(KnnQueryDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Knn(KnnQueryDescriptor descriptor) { KnnValue = null; KnnDescriptorAction = null; @@ -1113,7 +1106,7 @@ public AsyncSearchSubmitRequestDescriptor Knn(KnnQueryDescriptor Knn(Action> configure) + public SubmitAsyncSearchRequestDescriptor Knn(Action> configure) { KnnValue = null; KnnDescriptor = null; @@ -1121,7 +1114,7 @@ public AsyncSearchSubmitRequestDescriptor Knn(Action PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter) + public SubmitAsyncSearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? postFilter) { PostFilterDescriptor = null; PostFilterDescriptorAction = null; @@ -1129,7 +1122,7 @@ public AsyncSearchSubmitRequestDescriptor PostFilter(Elastic.Clients. return Self; } - public AsyncSearchSubmitRequestDescriptor PostFilter(QueryDsl.QueryContainerDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor PostFilter(QueryDsl.QueryDescriptor descriptor) { PostFilterValue = null; PostFilterDescriptorAction = null; @@ -1137,7 +1130,7 @@ public AsyncSearchSubmitRequestDescriptor PostFilter(QueryDsl.QueryCo return Self; } - public AsyncSearchSubmitRequestDescriptor PostFilter(Action> configure) + public SubmitAsyncSearchRequestDescriptor PostFilter(Action> configure) { PostFilterValue = null; PostFilterDescriptor = null; @@ -1145,7 +1138,7 @@ public AsyncSearchSubmitRequestDescriptor PostFilter(Action Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public SubmitAsyncSearchRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -1153,7 +1146,7 @@ public AsyncSearchSubmitRequestDescriptor Query(Elastic.Clients.Elast return Self; } - public AsyncSearchSubmitRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -1161,7 +1154,7 @@ public AsyncSearchSubmitRequestDescriptor Query(QueryDsl.QueryContain return Self; } - public AsyncSearchSubmitRequestDescriptor Query(Action> configure) + public SubmitAsyncSearchRequestDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -1169,7 +1162,7 @@ public AsyncSearchSubmitRequestDescriptor Query(Action Rescore(ICollection? rescore) + public SubmitAsyncSearchRequestDescriptor Rescore(ICollection? rescore) { RescoreDescriptor = null; RescoreDescriptorAction = null; @@ -1178,7 +1171,7 @@ public AsyncSearchSubmitRequestDescriptor Rescore(ICollection Rescore(Core.Search.RescoreDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Rescore(Core.Search.RescoreDescriptor descriptor) { RescoreValue = null; RescoreDescriptorAction = null; @@ -1187,7 +1180,7 @@ public AsyncSearchSubmitRequestDescriptor Rescore(Core.Search.Rescore return Self; } - public AsyncSearchSubmitRequestDescriptor Rescore(Action> configure) + public SubmitAsyncSearchRequestDescriptor Rescore(Action> configure) { RescoreValue = null; RescoreDescriptor = null; @@ -1196,7 +1189,7 @@ public AsyncSearchSubmitRequestDescriptor Rescore(Action Rescore(params Action>[] configure) + public SubmitAsyncSearchRequestDescriptor Rescore(params Action>[] configure) { RescoreValue = null; RescoreDescriptor = null; @@ -1205,7 +1198,7 @@ public AsyncSearchSubmitRequestDescriptor Rescore(params Action Slice(Elastic.Clients.Elasticsearch.SlicedScroll? slice) + public SubmitAsyncSearchRequestDescriptor Slice(Elastic.Clients.Elasticsearch.SlicedScroll? slice) { SliceDescriptor = null; SliceDescriptorAction = null; @@ -1213,7 +1206,7 @@ public AsyncSearchSubmitRequestDescriptor Slice(Elastic.Clients.Elast return Self; } - public AsyncSearchSubmitRequestDescriptor Slice(SlicedScrollDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Slice(SlicedScrollDescriptor descriptor) { SliceValue = null; SliceDescriptorAction = null; @@ -1221,7 +1214,7 @@ public AsyncSearchSubmitRequestDescriptor Slice(SlicedScrollDescripto return Self; } - public AsyncSearchSubmitRequestDescriptor Slice(Action> configure) + public SubmitAsyncSearchRequestDescriptor Slice(Action> configure) { SliceValue = null; SliceDescriptor = null; @@ -1229,7 +1222,7 @@ public AsyncSearchSubmitRequestDescriptor Slice(Action Sort(ICollection? sort) + public SubmitAsyncSearchRequestDescriptor Sort(ICollection? sort) { SortDescriptor = null; SortDescriptorAction = null; @@ -1238,7 +1231,7 @@ public AsyncSearchSubmitRequestDescriptor Sort(ICollection Sort(SortOptionsDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Sort(SortOptionsDescriptor descriptor) { SortValue = null; SortDescriptorAction = null; @@ -1247,7 +1240,7 @@ public AsyncSearchSubmitRequestDescriptor Sort(SortOptionsDescriptor< return Self; } - public AsyncSearchSubmitRequestDescriptor Sort(Action> configure) + public SubmitAsyncSearchRequestDescriptor Sort(Action> configure) { SortValue = null; SortDescriptor = null; @@ -1256,7 +1249,7 @@ public AsyncSearchSubmitRequestDescriptor Sort(Action Sort(params Action>[] configure) + public SubmitAsyncSearchRequestDescriptor Sort(params Action>[] configure) { SortValue = null; SortDescriptor = null; @@ -1265,43 +1258,43 @@ public AsyncSearchSubmitRequestDescriptor Sort(params Action Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) + public SubmitAsyncSearchRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; return Self; } - public AsyncSearchSubmitRequestDescriptor Explain(bool? explain = true) + public SubmitAsyncSearchRequestDescriptor Explain(bool? explain = true) { ExplainValue = explain; return Self; } - public AsyncSearchSubmitRequestDescriptor Ext(Func, FluentDictionary> selector) + public SubmitAsyncSearchRequestDescriptor Ext(Func, FluentDictionary> selector) { ExtValue = selector?.Invoke(new FluentDictionary()); return Self; } - public AsyncSearchSubmitRequestDescriptor From(int? from) + public SubmitAsyncSearchRequestDescriptor From(int? from) { FromValue = from; return Self; } - public AsyncSearchSubmitRequestDescriptor IndicesBoost(ICollection>? indicesBoost) + public SubmitAsyncSearchRequestDescriptor IndicesBoost(ICollection>? indicesBoost) { IndicesBoostValue = indicesBoost; return Self; } - public AsyncSearchSubmitRequestDescriptor MinScore(double? minScore) + public SubmitAsyncSearchRequestDescriptor MinScore(double? minScore) { MinScoreValue = minScore; return Self; } - public AsyncSearchSubmitRequestDescriptor Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit) + public SubmitAsyncSearchRequestDescriptor Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit) { PitDescriptor = null; PitDescriptorAction = null; @@ -1309,7 +1302,7 @@ public AsyncSearchSubmitRequestDescriptor Pit(Elastic.Clients.Elastic return Self; } - public AsyncSearchSubmitRequestDescriptor Pit(Core.Search.PointInTimeReferenceDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Pit(Core.Search.PointInTimeReferenceDescriptor descriptor) { PitValue = null; PitDescriptorAction = null; @@ -1317,7 +1310,7 @@ public AsyncSearchSubmitRequestDescriptor Pit(Core.Search.PointInTime return Self; } - public AsyncSearchSubmitRequestDescriptor Pit(Action configure) + public SubmitAsyncSearchRequestDescriptor Pit(Action configure) { PitValue = null; PitDescriptor = null; @@ -1325,55 +1318,55 @@ public AsyncSearchSubmitRequestDescriptor Pit(Action Profile(bool? profile = true) + public SubmitAsyncSearchRequestDescriptor Profile(bool? profile = true) { ProfileValue = profile; return Self; } - public AsyncSearchSubmitRequestDescriptor RuntimeMappings(Func, FluentDictionary> selector) + public SubmitAsyncSearchRequestDescriptor RuntimeMappings(Func, FluentDictionary> selector) { RuntimeMappingsValue = selector?.Invoke(new FluentDictionary()); return Self; } - public AsyncSearchSubmitRequestDescriptor ScriptFields(Func, FluentDictionary> selector) + public SubmitAsyncSearchRequestDescriptor ScriptFields(Func, FluentDictionary> selector) { ScriptFieldsValue = selector?.Invoke(new FluentDictionary()); return Self; } - public AsyncSearchSubmitRequestDescriptor SearchAfter(ICollection? searchAfter) + public SubmitAsyncSearchRequestDescriptor SearchAfter(ICollection? searchAfter) { SearchAfterValue = searchAfter; return Self; } - public AsyncSearchSubmitRequestDescriptor SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true) + public SubmitAsyncSearchRequestDescriptor SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true) { SeqNoPrimaryTermValue = seqNoPrimaryTerm; return Self; } - public AsyncSearchSubmitRequestDescriptor Size(int? size) + public SubmitAsyncSearchRequestDescriptor Size(int? size) { SizeValue = size; return Self; } - public AsyncSearchSubmitRequestDescriptor Stats(ICollection? stats) + public SubmitAsyncSearchRequestDescriptor Stats(ICollection? stats) { StatsValue = stats; return Self; } - public AsyncSearchSubmitRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) + public SubmitAsyncSearchRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) { StoredFieldsValue = storedFields; return Self; } - public AsyncSearchSubmitRequestDescriptor Suggest(Elastic.Clients.Elasticsearch.Core.Search.Suggester? suggest) + public SubmitAsyncSearchRequestDescriptor Suggest(Elastic.Clients.Elasticsearch.Core.Search.Suggester? suggest) { SuggestDescriptor = null; SuggestDescriptorAction = null; @@ -1381,7 +1374,7 @@ public AsyncSearchSubmitRequestDescriptor Suggest(Elastic.Clients.Ela return Self; } - public AsyncSearchSubmitRequestDescriptor Suggest(Core.Search.SuggesterDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Suggest(Core.Search.SuggesterDescriptor descriptor) { SuggestValue = null; SuggestDescriptorAction = null; @@ -1389,7 +1382,7 @@ public AsyncSearchSubmitRequestDescriptor Suggest(Core.Search.Suggest return Self; } - public AsyncSearchSubmitRequestDescriptor Suggest(Action configure) + public SubmitAsyncSearchRequestDescriptor Suggest(Action configure) { SuggestValue = null; SuggestDescriptor = null; @@ -1397,31 +1390,31 @@ public AsyncSearchSubmitRequestDescriptor Suggest(Action TerminateAfter(long? terminateAfter) + public SubmitAsyncSearchRequestDescriptor TerminateAfter(long? terminateAfter) { TerminateAfterValue = terminateAfter; return Self; } - public AsyncSearchSubmitRequestDescriptor Timeout(string? timeout) + public SubmitAsyncSearchRequestDescriptor Timeout(string? timeout) { TimeoutValue = timeout; return Self; } - public AsyncSearchSubmitRequestDescriptor TrackScores(bool? trackScores = true) + public SubmitAsyncSearchRequestDescriptor TrackScores(bool? trackScores = true) { TrackScoresValue = trackScores; return Self; } - public AsyncSearchSubmitRequestDescriptor TrackTotalHits(Elastic.Clients.Elasticsearch.Core.Search.TrackHits? trackTotalHits) + public SubmitAsyncSearchRequestDescriptor TrackTotalHits(Elastic.Clients.Elasticsearch.Core.Search.TrackHits? trackTotalHits) { TrackTotalHitsValue = trackTotalHits; return Self; } - public AsyncSearchSubmitRequestDescriptor Version(bool? version = true) + public SubmitAsyncSearchRequestDescriptor Version(bool? version = true) { VersionValue = version; return Self; @@ -1438,7 +1431,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -1564,7 +1557,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (PostFilterDescriptorAction is not null) { writer.WritePropertyName("post_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(PostFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(PostFilterDescriptorAction), options); } else if (PostFilterValue is not null) { @@ -1580,7 +1573,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -1814,49 +1807,49 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class AsyncSearchSubmitRequestDescriptor : RequestDescriptor +public sealed partial class SubmitAsyncSearchRequestDescriptor : RequestDescriptor { - internal AsyncSearchSubmitRequestDescriptor(Action configure) => configure.Invoke(this); - public AsyncSearchSubmitRequestDescriptor() + internal SubmitAsyncSearchRequestDescriptor(Action configure) => configure.Invoke(this); + public SubmitAsyncSearchRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchSubmit; internal override HttpMethod HttpMethod => HttpMethod.POST; internal override bool SupportsBody => true; - public AsyncSearchSubmitRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes); - public AsyncSearchSubmitRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes); - public AsyncSearchSubmitRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public AsyncSearchSubmitRequestDescriptor AllowPartialSearchResults(bool? allowPartialSearchResults = true) => Qs("allow_partial_search_results", allowPartialSearchResults); - public AsyncSearchSubmitRequestDescriptor AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard); - public AsyncSearchSubmitRequestDescriptor Analyzer(string? analyzer) => Qs("analyzer", analyzer); - public AsyncSearchSubmitRequestDescriptor BatchedReduceSize(long? batchedReduceSize) => Qs("batched_reduce_size", batchedReduceSize); - public AsyncSearchSubmitRequestDescriptor CcsMinimizeRoundtrips(bool? ccsMinimizeRoundtrips = true) => Qs("ccs_minimize_roundtrips", ccsMinimizeRoundtrips); - public AsyncSearchSubmitRequestDescriptor DefaultOperator(Elastic.Clients.Elasticsearch.QueryDsl.Operator? defaultOperator) => Qs("default_operator", defaultOperator); - public AsyncSearchSubmitRequestDescriptor Df(string? df) => Qs("df", df); - public AsyncSearchSubmitRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public AsyncSearchSubmitRequestDescriptor IgnoreThrottled(bool? ignoreThrottled = true) => Qs("ignore_throttled", ignoreThrottled); - public AsyncSearchSubmitRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public AsyncSearchSubmitRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); - public AsyncSearchSubmitRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true) => Qs("keep_on_completion", keepOnCompletion); - public AsyncSearchSubmitRequestDescriptor Lenient(bool? lenient = true) => Qs("lenient", lenient); - public AsyncSearchSubmitRequestDescriptor MaxConcurrentShardRequests(long? maxConcurrentShardRequests) => Qs("max_concurrent_shard_requests", maxConcurrentShardRequests); - public AsyncSearchSubmitRequestDescriptor MinCompatibleShardNode(string? minCompatibleShardNode) => Qs("min_compatible_shard_node", minCompatibleShardNode); - public AsyncSearchSubmitRequestDescriptor PreFilterShardSize(long? preFilterShardSize) => Qs("pre_filter_shard_size", preFilterShardSize); - public AsyncSearchSubmitRequestDescriptor Preference(string? preference) => Qs("preference", preference); - public AsyncSearchSubmitRequestDescriptor QueryLuceneSyntax(string? q) => Qs("q", q); - public AsyncSearchSubmitRequestDescriptor RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache); - public AsyncSearchSubmitRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt); - public AsyncSearchSubmitRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing); - public AsyncSearchSubmitRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll); - public AsyncSearchSubmitRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType); - public AsyncSearchSubmitRequestDescriptor SuggestField(Elastic.Clients.Elasticsearch.Field? suggestField) => Qs("suggest_field", suggestField); - public AsyncSearchSubmitRequestDescriptor SuggestMode(Elastic.Clients.Elasticsearch.SuggestMode? suggestMode) => Qs("suggest_mode", suggestMode); - public AsyncSearchSubmitRequestDescriptor SuggestSize(long? suggestSize) => Qs("suggest_size", suggestSize); - public AsyncSearchSubmitRequestDescriptor SuggestText(string? suggestText) => Qs("suggest_text", suggestText); - public AsyncSearchSubmitRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys); - public AsyncSearchSubmitRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); - public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public SubmitAsyncSearchRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes); + public SubmitAsyncSearchRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes); + public SubmitAsyncSearchRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public SubmitAsyncSearchRequestDescriptor AllowPartialSearchResults(bool? allowPartialSearchResults = true) => Qs("allow_partial_search_results", allowPartialSearchResults); + public SubmitAsyncSearchRequestDescriptor AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard); + public SubmitAsyncSearchRequestDescriptor Analyzer(string? analyzer) => Qs("analyzer", analyzer); + public SubmitAsyncSearchRequestDescriptor BatchedReduceSize(long? batchedReduceSize) => Qs("batched_reduce_size", batchedReduceSize); + public SubmitAsyncSearchRequestDescriptor CcsMinimizeRoundtrips(bool? ccsMinimizeRoundtrips = true) => Qs("ccs_minimize_roundtrips", ccsMinimizeRoundtrips); + public SubmitAsyncSearchRequestDescriptor DefaultOperator(Elastic.Clients.Elasticsearch.QueryDsl.Operator? defaultOperator) => Qs("default_operator", defaultOperator); + public SubmitAsyncSearchRequestDescriptor Df(string? df) => Qs("df", df); + public SubmitAsyncSearchRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public SubmitAsyncSearchRequestDescriptor IgnoreThrottled(bool? ignoreThrottled = true) => Qs("ignore_throttled", ignoreThrottled); + public SubmitAsyncSearchRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public SubmitAsyncSearchRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); + public SubmitAsyncSearchRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true) => Qs("keep_on_completion", keepOnCompletion); + public SubmitAsyncSearchRequestDescriptor Lenient(bool? lenient = true) => Qs("lenient", lenient); + public SubmitAsyncSearchRequestDescriptor MaxConcurrentShardRequests(long? maxConcurrentShardRequests) => Qs("max_concurrent_shard_requests", maxConcurrentShardRequests); + public SubmitAsyncSearchRequestDescriptor MinCompatibleShardNode(string? minCompatibleShardNode) => Qs("min_compatible_shard_node", minCompatibleShardNode); + public SubmitAsyncSearchRequestDescriptor PreFilterShardSize(long? preFilterShardSize) => Qs("pre_filter_shard_size", preFilterShardSize); + public SubmitAsyncSearchRequestDescriptor Preference(string? preference) => Qs("preference", preference); + public SubmitAsyncSearchRequestDescriptor QueryLuceneSyntax(string? q) => Qs("q", q); + public SubmitAsyncSearchRequestDescriptor RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache); + public SubmitAsyncSearchRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt); + public SubmitAsyncSearchRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing); + public SubmitAsyncSearchRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll); + public SubmitAsyncSearchRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType); + public SubmitAsyncSearchRequestDescriptor SuggestField(Elastic.Clients.Elasticsearch.Field? suggestField) => Qs("suggest_field", suggestField); + public SubmitAsyncSearchRequestDescriptor SuggestMode(Elastic.Clients.Elasticsearch.SuggestMode? suggestMode) => Qs("suggest_mode", suggestMode); + public SubmitAsyncSearchRequestDescriptor SuggestSize(long? suggestSize) => Qs("suggest_size", suggestSize); + public SubmitAsyncSearchRequestDescriptor SuggestText(string? suggestText) => Qs("suggest_text", suggestText); + public SubmitAsyncSearchRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys); + public SubmitAsyncSearchRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); + public SubmitAsyncSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; @@ -1864,9 +1857,9 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; } @@ -1902,17 +1895,17 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private Action KnnDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor PostFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; } - private Action PostFilterDescriptorAction { get; set; } + private Action PostFilterDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private ICollection? RescoreValue { get; set; } @@ -1986,7 +1979,7 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private bool? VersionValue { get; set; } - public AsyncSearchSubmitRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations) + public SubmitAsyncSearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations) { AggregationsDescriptor = null; AggregationsDescriptorAction = null; @@ -1994,7 +1987,7 @@ public AsyncSearchSubmitRequestDescriptor Aggregations(Elastic.Clients.Elasticse return Self; } - public AsyncSearchSubmitRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -2002,7 +1995,7 @@ public AsyncSearchSubmitRequestDescriptor Aggregations(Elastic.Clients.Elasticse return Self; } - public AsyncSearchSubmitRequestDescriptor Aggregations(Action configure) + public SubmitAsyncSearchRequestDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -2010,7 +2003,7 @@ public AsyncSearchSubmitRequestDescriptor Aggregations(Action configure) + public SubmitAsyncSearchRequestDescriptor Collapse(Action configure) { CollapseValue = null; CollapseDescriptor = null; @@ -2034,7 +2027,7 @@ public AsyncSearchSubmitRequestDescriptor Collapse(Action? docvalueFields) + public SubmitAsyncSearchRequestDescriptor DocvalueFields(ICollection? docvalueFields) { DocvalueFieldsDescriptor = null; DocvalueFieldsDescriptorAction = null; @@ -2043,7 +2036,7 @@ public AsyncSearchSubmitRequestDescriptor DocvalueFields(ICollection configure) + public SubmitAsyncSearchRequestDescriptor DocvalueFields(Action configure) { DocvalueFieldsValue = null; DocvalueFieldsDescriptor = null; @@ -2061,7 +2054,7 @@ public AsyncSearchSubmitRequestDescriptor DocvalueFields(Action[] configure) + public SubmitAsyncSearchRequestDescriptor DocvalueFields(params Action[] configure) { DocvalueFieldsValue = null; DocvalueFieldsDescriptor = null; @@ -2070,7 +2063,7 @@ public AsyncSearchSubmitRequestDescriptor DocvalueFields(params Action? fields) + public SubmitAsyncSearchRequestDescriptor Fields(ICollection? fields) { FieldsDescriptor = null; FieldsDescriptorAction = null; @@ -2079,7 +2072,7 @@ public AsyncSearchSubmitRequestDescriptor Fields(ICollection configure) + public SubmitAsyncSearchRequestDescriptor Fields(Action configure) { FieldsValue = null; FieldsDescriptor = null; @@ -2097,7 +2090,7 @@ public AsyncSearchSubmitRequestDescriptor Fields(Action[] configure) + public SubmitAsyncSearchRequestDescriptor Fields(params Action[] configure) { FieldsValue = null; FieldsDescriptor = null; @@ -2106,7 +2099,7 @@ public AsyncSearchSubmitRequestDescriptor Fields(params Action configure) + public SubmitAsyncSearchRequestDescriptor Highlight(Action configure) { HighlightValue = null; HighlightDescriptor = null; @@ -2130,7 +2123,7 @@ public AsyncSearchSubmitRequestDescriptor Highlight(Action configure) + public SubmitAsyncSearchRequestDescriptor Knn(Action configure) { KnnValue = null; KnnDescriptor = null; @@ -2154,7 +2147,7 @@ public AsyncSearchSubmitRequestDescriptor Knn(Action configu return Self; } - public AsyncSearchSubmitRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter) + public SubmitAsyncSearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? postFilter) { PostFilterDescriptor = null; PostFilterDescriptorAction = null; @@ -2162,7 +2155,7 @@ public AsyncSearchSubmitRequestDescriptor PostFilter(Elastic.Clients.Elasticsear return Self; } - public AsyncSearchSubmitRequestDescriptor PostFilter(QueryDsl.QueryContainerDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor PostFilter(QueryDsl.QueryDescriptor descriptor) { PostFilterValue = null; PostFilterDescriptorAction = null; @@ -2170,7 +2163,7 @@ public AsyncSearchSubmitRequestDescriptor PostFilter(QueryDsl.QueryContainerDesc return Self; } - public AsyncSearchSubmitRequestDescriptor PostFilter(Action configure) + public SubmitAsyncSearchRequestDescriptor PostFilter(Action configure) { PostFilterValue = null; PostFilterDescriptor = null; @@ -2178,7 +2171,7 @@ public AsyncSearchSubmitRequestDescriptor PostFilter(Action configure) + public SubmitAsyncSearchRequestDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -2202,7 +2195,7 @@ public AsyncSearchSubmitRequestDescriptor Query(Action? rescore) + public SubmitAsyncSearchRequestDescriptor Rescore(ICollection? rescore) { RescoreDescriptor = null; RescoreDescriptorAction = null; @@ -2211,7 +2204,7 @@ public AsyncSearchSubmitRequestDescriptor Rescore(ICollection configure) + public SubmitAsyncSearchRequestDescriptor Rescore(Action configure) { RescoreValue = null; RescoreDescriptor = null; @@ -2229,7 +2222,7 @@ public AsyncSearchSubmitRequestDescriptor Rescore(Action[] configure) + public SubmitAsyncSearchRequestDescriptor Rescore(params Action[] configure) { RescoreValue = null; RescoreDescriptor = null; @@ -2238,7 +2231,7 @@ public AsyncSearchSubmitRequestDescriptor Rescore(params Action configure) + public SubmitAsyncSearchRequestDescriptor Slice(Action configure) { SliceValue = null; SliceDescriptor = null; @@ -2262,7 +2255,7 @@ public AsyncSearchSubmitRequestDescriptor Slice(Action c return Self; } - public AsyncSearchSubmitRequestDescriptor Sort(ICollection? sort) + public SubmitAsyncSearchRequestDescriptor Sort(ICollection? sort) { SortDescriptor = null; SortDescriptorAction = null; @@ -2271,7 +2264,7 @@ public AsyncSearchSubmitRequestDescriptor Sort(ICollection configure) + public SubmitAsyncSearchRequestDescriptor Sort(Action configure) { SortValue = null; SortDescriptor = null; @@ -2289,7 +2282,7 @@ public AsyncSearchSubmitRequestDescriptor Sort(Action con return Self; } - public AsyncSearchSubmitRequestDescriptor Sort(params Action[] configure) + public SubmitAsyncSearchRequestDescriptor Sort(params Action[] configure) { SortValue = null; SortDescriptor = null; @@ -2298,43 +2291,43 @@ public AsyncSearchSubmitRequestDescriptor Sort(params Action, FluentDictionary> selector) + public SubmitAsyncSearchRequestDescriptor Ext(Func, FluentDictionary> selector) { ExtValue = selector?.Invoke(new FluentDictionary()); return Self; } - public AsyncSearchSubmitRequestDescriptor From(int? from) + public SubmitAsyncSearchRequestDescriptor From(int? from) { FromValue = from; return Self; } - public AsyncSearchSubmitRequestDescriptor IndicesBoost(ICollection>? indicesBoost) + public SubmitAsyncSearchRequestDescriptor IndicesBoost(ICollection>? indicesBoost) { IndicesBoostValue = indicesBoost; return Self; } - public AsyncSearchSubmitRequestDescriptor MinScore(double? minScore) + public SubmitAsyncSearchRequestDescriptor MinScore(double? minScore) { MinScoreValue = minScore; return Self; } - public AsyncSearchSubmitRequestDescriptor Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit) + public SubmitAsyncSearchRequestDescriptor Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit) { PitDescriptor = null; PitDescriptorAction = null; @@ -2342,7 +2335,7 @@ public AsyncSearchSubmitRequestDescriptor Pit(Elastic.Clients.Elasticsearch.Core return Self; } - public AsyncSearchSubmitRequestDescriptor Pit(Core.Search.PointInTimeReferenceDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Pit(Core.Search.PointInTimeReferenceDescriptor descriptor) { PitValue = null; PitDescriptorAction = null; @@ -2350,7 +2343,7 @@ public AsyncSearchSubmitRequestDescriptor Pit(Core.Search.PointInTimeReferenceDe return Self; } - public AsyncSearchSubmitRequestDescriptor Pit(Action configure) + public SubmitAsyncSearchRequestDescriptor Pit(Action configure) { PitValue = null; PitDescriptor = null; @@ -2358,55 +2351,55 @@ public AsyncSearchSubmitRequestDescriptor Pit(Action, FluentDictionary> selector) + public SubmitAsyncSearchRequestDescriptor RuntimeMappings(Func, FluentDictionary> selector) { RuntimeMappingsValue = selector?.Invoke(new FluentDictionary()); return Self; } - public AsyncSearchSubmitRequestDescriptor ScriptFields(Func, FluentDictionary> selector) + public SubmitAsyncSearchRequestDescriptor ScriptFields(Func, FluentDictionary> selector) { ScriptFieldsValue = selector?.Invoke(new FluentDictionary()); return Self; } - public AsyncSearchSubmitRequestDescriptor SearchAfter(ICollection? searchAfter) + public SubmitAsyncSearchRequestDescriptor SearchAfter(ICollection? searchAfter) { SearchAfterValue = searchAfter; return Self; } - public AsyncSearchSubmitRequestDescriptor SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true) + public SubmitAsyncSearchRequestDescriptor SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true) { SeqNoPrimaryTermValue = seqNoPrimaryTerm; return Self; } - public AsyncSearchSubmitRequestDescriptor Size(int? size) + public SubmitAsyncSearchRequestDescriptor Size(int? size) { SizeValue = size; return Self; } - public AsyncSearchSubmitRequestDescriptor Stats(ICollection? stats) + public SubmitAsyncSearchRequestDescriptor Stats(ICollection? stats) { StatsValue = stats; return Self; } - public AsyncSearchSubmitRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) + public SubmitAsyncSearchRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) { StoredFieldsValue = storedFields; return Self; } - public AsyncSearchSubmitRequestDescriptor Suggest(Elastic.Clients.Elasticsearch.Core.Search.Suggester? suggest) + public SubmitAsyncSearchRequestDescriptor Suggest(Elastic.Clients.Elasticsearch.Core.Search.Suggester? suggest) { SuggestDescriptor = null; SuggestDescriptorAction = null; @@ -2414,7 +2407,7 @@ public AsyncSearchSubmitRequestDescriptor Suggest(Elastic.Clients.Elasticsearch. return Self; } - public AsyncSearchSubmitRequestDescriptor Suggest(Core.Search.SuggesterDescriptor descriptor) + public SubmitAsyncSearchRequestDescriptor Suggest(Core.Search.SuggesterDescriptor descriptor) { SuggestValue = null; SuggestDescriptorAction = null; @@ -2422,7 +2415,7 @@ public AsyncSearchSubmitRequestDescriptor Suggest(Core.Search.SuggesterDescripto return Self; } - public AsyncSearchSubmitRequestDescriptor Suggest(Action configure) + public SubmitAsyncSearchRequestDescriptor Suggest(Action configure) { SuggestValue = null; SuggestDescriptor = null; @@ -2430,31 +2423,31 @@ public AsyncSearchSubmitRequestDescriptor Suggest(Action : ElasticsearchResponse +public sealed partial class SubmitAsyncSearchResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("expiration_time")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthRequest.g.cs similarity index 58% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthRequest.g.cs index 1229606e8c0..de5fdaf8df5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Cluster; -public sealed class ClusterHealthRequestParameters : RequestParameters +public sealed class HealthRequestParameters : RequestParameters { [JsonIgnore] public ICollection? ExpandWildcards { get => Q?>("expand_wildcards"); set => Q("expand_wildcards", value); } @@ -63,13 +63,13 @@ public sealed class ClusterHealthRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.HealthStatus? WaitForStatus { get => Q("wait_for_status"); set => Q("wait_for_status", value); } } -public sealed partial class ClusterHealthRequest : PlainRequest +public sealed partial class HealthRequest : PlainRequest { - public ClusterHealthRequest() + public HealthRequest() { } - public ClusterHealthRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public HealthRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } @@ -110,28 +110,28 @@ public ClusterHealthRequest(Elastic.Clients.Elasticsearch.Indices? indices) : ba public Elastic.Clients.Elasticsearch.HealthStatus? WaitForStatus { get => Q("wait_for_status"); set => Q("wait_for_status", value); } } -public sealed partial class ClusterHealthRequestDescriptor : RequestDescriptor, ClusterHealthRequestParameters> +public sealed partial class HealthRequestDescriptor : RequestDescriptor, HealthRequestParameters> { - internal ClusterHealthRequestDescriptor(Action> configure) => configure.Invoke(this); - public ClusterHealthRequestDescriptor() + internal HealthRequestDescriptor(Action> configure) => configure.Invoke(this); + public HealthRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.ClusterHealth; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public ClusterHealthRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public ClusterHealthRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level); - public ClusterHealthRequestDescriptor Local(bool? local = true) => Qs("local", local); - public ClusterHealthRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public ClusterHealthRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public ClusterHealthRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public ClusterHealthRequestDescriptor WaitForEvents(Elastic.Clients.Elasticsearch.WaitForEvents? waitForEvents) => Qs("wait_for_events", waitForEvents); - public ClusterHealthRequestDescriptor WaitForNoInitializingShards(bool? waitForNoInitializingShards = true) => Qs("wait_for_no_initializing_shards", waitForNoInitializingShards); - public ClusterHealthRequestDescriptor WaitForNoRelocatingShards(bool? waitForNoRelocatingShards = true) => Qs("wait_for_no_relocating_shards", waitForNoRelocatingShards); - public ClusterHealthRequestDescriptor WaitForNodes(Union? waitForNodes) => Qs("wait_for_nodes", waitForNodes); - public ClusterHealthRequestDescriptor WaitForStatus(Elastic.Clients.Elasticsearch.HealthStatus? waitForStatus) => Qs("wait_for_status", waitForStatus); - public ClusterHealthRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public HealthRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public HealthRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level); + public HealthRequestDescriptor Local(bool? local = true) => Qs("local", local); + public HealthRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public HealthRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public HealthRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public HealthRequestDescriptor WaitForEvents(Elastic.Clients.Elasticsearch.WaitForEvents? waitForEvents) => Qs("wait_for_events", waitForEvents); + public HealthRequestDescriptor WaitForNoInitializingShards(bool? waitForNoInitializingShards = true) => Qs("wait_for_no_initializing_shards", waitForNoInitializingShards); + public HealthRequestDescriptor WaitForNoRelocatingShards(bool? waitForNoRelocatingShards = true) => Qs("wait_for_no_relocating_shards", waitForNoRelocatingShards); + public HealthRequestDescriptor WaitForNodes(Union? waitForNodes) => Qs("wait_for_nodes", waitForNodes); + public HealthRequestDescriptor WaitForStatus(Elastic.Clients.Elasticsearch.HealthStatus? waitForStatus) => Qs("wait_for_status", waitForStatus); + public HealthRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; @@ -142,28 +142,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class ClusterHealthRequestDescriptor : RequestDescriptor +public sealed partial class HealthRequestDescriptor : RequestDescriptor { - internal ClusterHealthRequestDescriptor(Action configure) => configure.Invoke(this); - public ClusterHealthRequestDescriptor() + internal HealthRequestDescriptor(Action configure) => configure.Invoke(this); + public HealthRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.ClusterHealth; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public ClusterHealthRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public ClusterHealthRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level); - public ClusterHealthRequestDescriptor Local(bool? local = true) => Qs("local", local); - public ClusterHealthRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public ClusterHealthRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public ClusterHealthRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public ClusterHealthRequestDescriptor WaitForEvents(Elastic.Clients.Elasticsearch.WaitForEvents? waitForEvents) => Qs("wait_for_events", waitForEvents); - public ClusterHealthRequestDescriptor WaitForNoInitializingShards(bool? waitForNoInitializingShards = true) => Qs("wait_for_no_initializing_shards", waitForNoInitializingShards); - public ClusterHealthRequestDescriptor WaitForNoRelocatingShards(bool? waitForNoRelocatingShards = true) => Qs("wait_for_no_relocating_shards", waitForNoRelocatingShards); - public ClusterHealthRequestDescriptor WaitForNodes(Union? waitForNodes) => Qs("wait_for_nodes", waitForNodes); - public ClusterHealthRequestDescriptor WaitForStatus(Elastic.Clients.Elasticsearch.HealthStatus? waitForStatus) => Qs("wait_for_status", waitForStatus); - public ClusterHealthRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public HealthRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public HealthRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level); + public HealthRequestDescriptor Local(bool? local = true) => Qs("local", local); + public HealthRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public HealthRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public HealthRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public HealthRequestDescriptor WaitForEvents(Elastic.Clients.Elasticsearch.WaitForEvents? waitForEvents) => Qs("wait_for_events", waitForEvents); + public HealthRequestDescriptor WaitForNoInitializingShards(bool? waitForNoInitializingShards = true) => Qs("wait_for_no_initializing_shards", waitForNoInitializingShards); + public HealthRequestDescriptor WaitForNoRelocatingShards(bool? waitForNoRelocatingShards = true) => Qs("wait_for_no_relocating_shards", waitForNoRelocatingShards); + public HealthRequestDescriptor WaitForNodes(Union? waitForNodes) => Qs("wait_for_nodes", waitForNodes); + public HealthRequestDescriptor WaitForStatus(Elastic.Clients.Elasticsearch.HealthStatus? waitForStatus) => Qs("wait_for_status", waitForStatus); + public HealthRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs similarity index 97% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs index fbe7323c229..e7bd8c54ef7 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Cluster; -public sealed partial class ClusterHealthResponse : ElasticsearchResponse +public sealed partial class HealthResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("active_primary_shards")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountRequest.g.cs index 5d9130b7f28..e06eaf4291a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountRequest.g.cs @@ -129,7 +129,7 @@ public CountRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } } public sealed partial class CountRequestDescriptor : RequestDescriptor, CountRequestParameters> @@ -166,13 +166,13 @@ public CountRequestDescriptor Indices(Elastic.Clients.Elasticsearch.I return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } - public CountRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public CountRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -180,7 +180,7 @@ public CountRequestDescriptor Query(Elastic.Clients.Elasticsearch.Que return Self; } - public CountRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public CountRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -188,7 +188,7 @@ public CountRequestDescriptor Query(QueryDsl.QueryContainerDescriptor return Self; } - public CountRequestDescriptor Query(Action> configure) + public CountRequestDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -207,7 +207,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -253,13 +253,13 @@ public CountRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? ind return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } - public CountRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public CountRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -267,7 +267,7 @@ public CountRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query return Self; } - public CountRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public CountRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -275,7 +275,7 @@ public CountRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor return Self; } - public CountRequestDescriptor Query(Action configure) + public CountRequestDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -294,7 +294,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs index 438147737f3..81713fc52a6 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs @@ -213,7 +213,7 @@ public DeleteByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } [JsonInclude] [JsonPropertyName("slice")] @@ -268,11 +268,11 @@ public DeleteByQueryRequestDescriptor Indices(Elastic.Clients.Elastic return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; } @@ -282,7 +282,7 @@ public DeleteByQueryRequestDescriptor Indices(Elastic.Clients.Elastic private long? MaxDocsValue { get; set; } - public DeleteByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public DeleteByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -290,7 +290,7 @@ public DeleteByQueryRequestDescriptor Query(Elastic.Clients.Elasticse return Self; } - public DeleteByQueryRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public DeleteByQueryRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -298,7 +298,7 @@ public DeleteByQueryRequestDescriptor Query(QueryDsl.QueryContainerDe return Self; } - public DeleteByQueryRequestDescriptor Query(Action> configure) + public DeleteByQueryRequestDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -347,7 +347,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -429,11 +429,11 @@ public DeleteByQueryRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indi return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; } @@ -443,7 +443,7 @@ public DeleteByQueryRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indi private long? MaxDocsValue { get; set; } - public DeleteByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public DeleteByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -451,7 +451,7 @@ public DeleteByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryD return Self; } - public DeleteByQueryRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public DeleteByQueryRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -459,7 +459,7 @@ public DeleteByQueryRequestDescriptor Query(QueryDsl.QueryContainerDescriptor de return Self; } - public DeleteByQueryRequestDescriptor Query(Action configure) + public DeleteByQueryRequestDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -508,7 +508,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/DeleteEqlRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteRequest.g.cs similarity index 74% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/DeleteEqlRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteRequest.g.cs index 9add579fb30..120110d59dc 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/DeleteEqlRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteRequest.g.cs @@ -27,13 +27,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Eql; -public sealed class DeleteEqlRequestParameters : RequestParameters +public sealed class EqlDeleteRequestParameters : RequestParameters { } -public sealed partial class DeleteEqlRequest : PlainRequest +public sealed partial class EqlDeleteRequest : PlainRequest { - public DeleteEqlRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + public EqlDeleteRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } @@ -42,21 +42,21 @@ public DeleteEqlRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Requi internal override bool SupportsBody => false; } -public sealed partial class DeleteEqlRequestDescriptor : RequestDescriptor, DeleteEqlRequestParameters> +public sealed partial class EqlDeleteRequestDescriptor : RequestDescriptor, EqlDeleteRequestParameters> { - internal DeleteEqlRequestDescriptor(Action> configure) => configure.Invoke(this); - public DeleteEqlRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal EqlDeleteRequestDescriptor(Action> configure) => configure.Invoke(this); + public EqlDeleteRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal DeleteEqlRequestDescriptor() + internal EqlDeleteRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlDelete; internal override HttpMethod HttpMethod => HttpMethod.DELETE; internal override bool SupportsBody => false; - public DeleteEqlRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public EqlDeleteRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; @@ -67,21 +67,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class DeleteEqlRequestDescriptor : RequestDescriptor +public sealed partial class EqlDeleteRequestDescriptor : RequestDescriptor { - internal DeleteEqlRequestDescriptor(Action configure) => configure.Invoke(this); - public DeleteEqlRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal EqlDeleteRequestDescriptor(Action configure) => configure.Invoke(this); + public EqlDeleteRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal DeleteEqlRequestDescriptor() + internal EqlDeleteRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlDelete; internal override HttpMethod HttpMethod => HttpMethod.DELETE; internal override bool SupportsBody => false; - public DeleteEqlRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public EqlDeleteRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/DeleteEqlResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/DeleteEqlResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs index 99638ae416f..f9165cf8203 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/DeleteEqlResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Eql; -public sealed partial class DeleteEqlResponse : ElasticsearchResponse +public sealed partial class EqlDeleteResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetRequest.g.cs similarity index 77% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetRequest.g.cs index 47716675a3f..c2c07866efe 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Eql; -public sealed class GetEqlRequestParameters : RequestParameters +public sealed class EqlGetRequestParameters : RequestParameters { [JsonIgnore] public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q("keep_alive"); set => Q("keep_alive", value); } @@ -36,9 +36,9 @@ public sealed class GetEqlRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); } } -public sealed partial class GetEqlRequest : PlainRequest +public sealed partial class EqlGetRequest : PlainRequest { - public GetEqlRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + public EqlGetRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } @@ -52,23 +52,23 @@ public GetEqlRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); } } -public sealed partial class GetEqlRequestDescriptor : RequestDescriptor, GetEqlRequestParameters> +public sealed partial class EqlGetRequestDescriptor : RequestDescriptor, EqlGetRequestParameters> { - internal GetEqlRequestDescriptor(Action> configure) => configure.Invoke(this); - public GetEqlRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal EqlGetRequestDescriptor(Action> configure) => configure.Invoke(this); + public EqlGetRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal GetEqlRequestDescriptor() + internal EqlGetRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGet; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public GetEqlRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); - public GetEqlRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); - public GetEqlRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public EqlGetRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); + public EqlGetRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); + public EqlGetRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; @@ -79,23 +79,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class GetEqlRequestDescriptor : RequestDescriptor +public sealed partial class EqlGetRequestDescriptor : RequestDescriptor { - internal GetEqlRequestDescriptor(Action configure) => configure.Invoke(this); - public GetEqlRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal EqlGetRequestDescriptor(Action configure) => configure.Invoke(this); + public EqlGetRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal GetEqlRequestDescriptor() + internal EqlGetRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGet; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public GetEqlRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); - public GetEqlRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); - public GetEqlRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public EqlGetRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); + public EqlGetRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); + public EqlGetRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs index 3688f222ada..ed55b0bc3ec 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Eql; -public sealed partial class GetEqlResponse : ElasticsearchResponse +public sealed partial class EqlGetResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("hits")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs index 3c2cab088d3..adb580bf220 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs @@ -83,7 +83,7 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r [JsonInclude] [JsonPropertyName("filter")] - public ICollection? Filter { get; set; } + public ICollection? Filter { get; set; } [JsonInclude] [JsonPropertyName("keep_alive")] @@ -145,13 +145,13 @@ public EqlSearchRequestDescriptor Indices(Elastic.Clients.Elasticsear private Action>[] FieldsDescriptorActions { get; set; } - private ICollection? FilterValue { get; set; } + private ICollection? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } - private Action>[] FilterDescriptorActions { get; set; } + private Action>[] FilterDescriptorActions { get; set; } private bool? CaseSensitiveValue { get; set; } @@ -213,7 +213,7 @@ public EqlSearchRequestDescriptor Fields(params Action Filter(ICollection? filter) + public EqlSearchRequestDescriptor Filter(ICollection? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -222,7 +222,7 @@ public EqlSearchRequestDescriptor Filter(ICollection Filter(QueryDsl.QueryContainerDescriptor descriptor) + public EqlSearchRequestDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -231,7 +231,7 @@ public EqlSearchRequestDescriptor Filter(QueryDsl.QueryContainerDescr return Self; } - public EqlSearchRequestDescriptor Filter(Action> configure) + public EqlSearchRequestDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -240,7 +240,7 @@ public EqlSearchRequestDescriptor Filter(Action Filter(params Action>[] configure) + public EqlSearchRequestDescriptor Filter(params Action>[] configure) { FilterValue = null; FilterDescriptor = null; @@ -384,7 +384,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("filter"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); writer.WriteEndArray(); } else if (FilterDescriptorActions is not null) @@ -393,7 +393,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in FilterDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -507,13 +507,13 @@ public EqlSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices private Action[] FieldsDescriptorActions { get; set; } - private ICollection? FilterValue { get; set; } + private ICollection? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } - private Action[] FilterDescriptorActions { get; set; } + private Action[] FilterDescriptorActions { get; set; } private bool? CaseSensitiveValue { get; set; } @@ -575,7 +575,7 @@ public EqlSearchRequestDescriptor Fields(params Action? filter) + public EqlSearchRequestDescriptor Filter(ICollection? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -584,7 +584,7 @@ public EqlSearchRequestDescriptor Filter(ICollection configure) + public EqlSearchRequestDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -602,7 +602,7 @@ public EqlSearchRequestDescriptor Filter(Action[] configure) + public EqlSearchRequestDescriptor Filter(params Action[] configure) { FilterValue = null; FilterDescriptor = null; @@ -764,7 +764,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("filter"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); writer.WriteEndArray(); } else if (FilterDescriptorActions is not null) @@ -773,7 +773,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in FilterDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(action), options); } writer.WriteEndArray(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusRequest.g.cs similarity index 73% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusRequest.g.cs index 4941a9f156c..7b092a12150 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusRequest.g.cs @@ -27,13 +27,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Eql; -public sealed class EqlGetStatusRequestParameters : RequestParameters +public sealed class GetEqlStatusRequestParameters : RequestParameters { } -public sealed partial class EqlGetStatusRequest : PlainRequest +public sealed partial class GetEqlStatusRequest : PlainRequest { - public EqlGetStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + public GetEqlStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } @@ -42,21 +42,21 @@ public EqlGetStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Re internal override bool SupportsBody => false; } -public sealed partial class EqlGetStatusRequestDescriptor : RequestDescriptor, EqlGetStatusRequestParameters> +public sealed partial class GetEqlStatusRequestDescriptor : RequestDescriptor, GetEqlStatusRequestParameters> { - internal EqlGetStatusRequestDescriptor(Action> configure) => configure.Invoke(this); - public EqlGetStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal GetEqlStatusRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetEqlStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal EqlGetStatusRequestDescriptor() + internal GetEqlStatusRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGetStatus; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public EqlGetStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetEqlStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; @@ -67,21 +67,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class EqlGetStatusRequestDescriptor : RequestDescriptor +public sealed partial class GetEqlStatusRequestDescriptor : RequestDescriptor { - internal EqlGetStatusRequestDescriptor(Action configure) => configure.Invoke(this); - public EqlGetStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal GetEqlStatusRequestDescriptor(Action configure) => configure.Invoke(this); + public GetEqlStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal EqlGetStatusRequestDescriptor() + internal GetEqlStatusRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGetStatus; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public EqlGetStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetEqlStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs index 6eacd142c11..eeea9a02a6d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Eql; -public sealed partial class EqlGetStatusResponse : ElasticsearchResponse +public sealed partial class GetEqlStatusResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("completion_status")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainRequest.g.cs index ce7ee068750..355a2329d40 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainRequest.g.cs @@ -113,7 +113,7 @@ public ExplainRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Cli [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } } public sealed partial class ExplainRequestDescriptor : RequestDescriptor, ExplainRequestParameters> @@ -174,13 +174,13 @@ public ExplainRequestDescriptor Index(Elastic.Clients.Elasticsearch.I return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } - public ExplainRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public ExplainRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -188,7 +188,7 @@ public ExplainRequestDescriptor Query(Elastic.Clients.Elasticsearch.Q return Self; } - public ExplainRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public ExplainRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -196,7 +196,7 @@ public ExplainRequestDescriptor Query(QueryDsl.QueryContainerDescript return Self; } - public ExplainRequestDescriptor Query(Action> configure) + public ExplainRequestDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -215,7 +215,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -265,13 +265,13 @@ public ExplainRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName in return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } - public ExplainRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public ExplainRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -279,7 +279,7 @@ public ExplainRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Que return Self; } - public ExplainRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public ExplainRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -287,7 +287,7 @@ public ExplainRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descript return Self; } - public ExplainRequestDescriptor Query(Action configure) + public ExplainRequestDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -306,7 +306,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs index babbee6d3d9..0df71edb75e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs @@ -87,7 +87,7 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r [JsonInclude] [JsonPropertyName("index_filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? IndexFilter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilter { get; set; } [JsonInclude] [JsonPropertyName("runtime_mappings")] @@ -117,15 +117,15 @@ public FieldCapsRequestDescriptor Indices(Elastic.Clients.Elasticsear return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? IndexFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor IndexFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor IndexFilterDescriptor { get; set; } - private Action> IndexFilterDescriptorAction { get; set; } + private Action> IndexFilterDescriptorAction { get; set; } private Dictionary? RuntimeMappingsValue { get; set; } - public FieldCapsRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? indexFilter) + public FieldCapsRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? indexFilter) { IndexFilterDescriptor = null; IndexFilterDescriptorAction = null; @@ -133,7 +133,7 @@ public FieldCapsRequestDescriptor IndexFilter(Elastic.Clients.Elastic return Self; } - public FieldCapsRequestDescriptor IndexFilter(QueryDsl.QueryContainerDescriptor descriptor) + public FieldCapsRequestDescriptor IndexFilter(QueryDsl.QueryDescriptor descriptor) { IndexFilterValue = null; IndexFilterDescriptorAction = null; @@ -141,7 +141,7 @@ public FieldCapsRequestDescriptor IndexFilter(QueryDsl.QueryContainer return Self; } - public FieldCapsRequestDescriptor IndexFilter(Action> configure) + public FieldCapsRequestDescriptor IndexFilter(Action> configure) { IndexFilterValue = null; IndexFilterDescriptor = null; @@ -166,7 +166,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (IndexFilterDescriptorAction is not null) { writer.WritePropertyName("index_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(IndexFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(IndexFilterDescriptorAction), options); } else if (IndexFilterValue is not null) { @@ -207,15 +207,15 @@ public FieldCapsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? IndexFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor IndexFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor IndexFilterDescriptor { get; set; } - private Action IndexFilterDescriptorAction { get; set; } + private Action IndexFilterDescriptorAction { get; set; } private Dictionary? RuntimeMappingsValue { get; set; } - public FieldCapsRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? indexFilter) + public FieldCapsRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? indexFilter) { IndexFilterDescriptor = null; IndexFilterDescriptorAction = null; @@ -223,7 +223,7 @@ public FieldCapsRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.Quer return Self; } - public FieldCapsRequestDescriptor IndexFilter(QueryDsl.QueryContainerDescriptor descriptor) + public FieldCapsRequestDescriptor IndexFilter(QueryDsl.QueryDescriptor descriptor) { IndexFilterValue = null; IndexFilterDescriptorAction = null; @@ -231,7 +231,7 @@ public FieldCapsRequestDescriptor IndexFilter(QueryDsl.QueryContainerDescriptor return Self; } - public FieldCapsRequestDescriptor IndexFilter(Action configure) + public FieldCapsRequestDescriptor IndexFilter(Action configure) { IndexFilterValue = null; IndexFilterDescriptor = null; @@ -256,7 +256,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (IndexFilterDescriptorAction is not null) { writer.WritePropertyName("index_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(IndexFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(IndexFilterDescriptorAction), options); } else if (IndexFilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptContextRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextRequest.g.cs similarity index 80% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptContextRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextRequest.g.cs index 22ae508a6e7..e70c7857a64 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptContextRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextRequest.g.cs @@ -27,21 +27,21 @@ #nullable restore namespace Elastic.Clients.Elasticsearch; -public sealed class ScriptContextRequestParameters : RequestParameters +public sealed class GetScriptContextRequestParameters : RequestParameters { } -public sealed partial class ScriptContextRequest : PlainRequest +public sealed partial class GetScriptContextRequest : PlainRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScriptContext; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; } -public sealed partial class ScriptContextRequestDescriptor : RequestDescriptor +public sealed partial class GetScriptContextRequestDescriptor : RequestDescriptor { - internal ScriptContextRequestDescriptor(Action configure) => configure.Invoke(this); - public ScriptContextRequestDescriptor() + internal GetScriptContextRequestDescriptor(Action configure) => configure.Invoke(this); + public GetScriptContextRequestDescriptor() { } diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptContextResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptContextResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs index 51abfb30300..38d381059f9 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptContextResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch; -public sealed partial class ScriptContextResponse : ElasticsearchResponse +public sealed partial class GetScriptContextResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("contexts")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptLanguagesRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesRequest.g.cs similarity index 80% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptLanguagesRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesRequest.g.cs index 20a610e9e58..a65c2698890 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptLanguagesRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesRequest.g.cs @@ -27,21 +27,21 @@ #nullable restore namespace Elastic.Clients.Elasticsearch; -public sealed class ScriptLanguagesRequestParameters : RequestParameters +public sealed class GetScriptLanguagesRequestParameters : RequestParameters { } -public sealed partial class ScriptLanguagesRequest : PlainRequest +public sealed partial class GetScriptLanguagesRequest : PlainRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScriptLanguages; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; } -public sealed partial class ScriptLanguagesRequestDescriptor : RequestDescriptor +public sealed partial class GetScriptLanguagesRequestDescriptor : RequestDescriptor { - internal ScriptLanguagesRequestDescriptor(Action configure) => configure.Invoke(this); - public ScriptLanguagesRequestDescriptor() + internal GetScriptLanguagesRequestDescriptor(Action configure) => configure.Invoke(this); + public GetScriptLanguagesRequestDescriptor() { } diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptLanguagesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptLanguagesResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs index e6716439324..9cc1082ca0e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptLanguagesResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch; -public sealed partial class ScriptLanguagesResponse : ElasticsearchResponse +public sealed partial class GetScriptLanguagesResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("language_contexts")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptRequest.g.cs similarity index 65% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptRequest.g.cs index 31acd0558d0..f98296b6443 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptRequest.g.cs @@ -27,15 +27,15 @@ #nullable restore namespace Elastic.Clients.Elasticsearch; -public sealed class ScriptRequestParameters : RequestParameters +public sealed class GetScriptRequestParameters : RequestParameters { [JsonIgnore] public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } } -public sealed partial class ScriptRequest : PlainRequest +public sealed partial class GetScriptRequest : PlainRequest { - public ScriptRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + public GetScriptRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } @@ -46,22 +46,22 @@ public ScriptRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } } -public sealed partial class ScriptRequestDescriptor : RequestDescriptor, ScriptRequestParameters> +public sealed partial class GetScriptRequestDescriptor : RequestDescriptor, GetScriptRequestParameters> { - internal ScriptRequestDescriptor(Action> configure) => configure.Invoke(this); - public ScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal GetScriptRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal ScriptRequestDescriptor() + internal GetScriptRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScript; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public ScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public ScriptRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public GetScriptRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; @@ -72,22 +72,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class ScriptRequestDescriptor : RequestDescriptor +public sealed partial class GetScriptRequestDescriptor : RequestDescriptor { - internal ScriptRequestDescriptor(Action configure) => configure.Invoke(this); - public ScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal GetScriptRequestDescriptor(Action configure) => configure.Invoke(this); + public GetScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal ScriptRequestDescriptor() + internal GetScriptRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScript; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public ScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public ScriptRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public GetScriptRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs index 8a3a9b5e1c3..9aa12ccc62f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch; -public sealed partial class ScriptResponse : ElasticsearchResponse +public sealed partial class GetScriptResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("found")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SourceRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceRequest.g.cs similarity index 55% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/SourceRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceRequest.g.cs index 0bd2c2dbda1..f1d360248c3 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SourceRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch; -public sealed class SourceRequestParameters : RequestParameters +public sealed class GetSourceRequestParameters : RequestParameters { [JsonIgnore] public string? Preference { get => Q("preference"); set => Q("preference", value); } @@ -60,9 +60,9 @@ public sealed class SourceRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q("version_type"); set => Q("version_type", value); } } -public sealed partial class SourceRequest : PlainRequest +public sealed partial class GetSourceRequest : PlainRequest { - public SourceRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id)) + public GetSourceRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id)) { } @@ -100,57 +100,57 @@ public SourceRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q("version_type"); set => Q("version_type", value); } } -public sealed partial class SourceRequestDescriptor : RequestDescriptor, SourceRequestParameters> +public sealed partial class GetSourceRequestDescriptor : RequestDescriptor, GetSourceRequestParameters> { - internal SourceRequestDescriptor(Action> configure) => configure.Invoke(this); - public SourceRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id)) + internal GetSourceRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetSourceRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id)) { } - public SourceRequestDescriptor(TDocument document) : this(typeof(TDocument), Elasticsearch.Id.From(document)) + public GetSourceRequestDescriptor(TDocument document) : this(typeof(TDocument), Elasticsearch.Id.From(document)) { } - public SourceRequestDescriptor(TDocument document, IndexName index, Id id) : this(index, id) + public GetSourceRequestDescriptor(TDocument document, IndexName index, Id id) : this(index, id) { } - public SourceRequestDescriptor(TDocument document, IndexName index) : this(index, Elasticsearch.Id.From(document)) + public GetSourceRequestDescriptor(TDocument document, IndexName index) : this(index, Elasticsearch.Id.From(document)) { } - public SourceRequestDescriptor(TDocument document, Id id) : this(typeof(TDocument), id) + public GetSourceRequestDescriptor(TDocument document, Id id) : this(typeof(TDocument), id) { } - public SourceRequestDescriptor(Id id) : this(typeof(TDocument), id) + public GetSourceRequestDescriptor(Id id) : this(typeof(TDocument), id) { } - internal SourceRequestDescriptor() + internal GetSourceRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetSource; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public SourceRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source); - public SourceRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes); - public SourceRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes); - public SourceRequestDescriptor Preference(string? preference) => Qs("preference", preference); - public SourceRequestDescriptor Realtime(bool? realtime = true) => Qs("realtime", realtime); - public SourceRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh); - public SourceRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing); - public SourceRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields); - public SourceRequestDescriptor Version(long? version) => Qs("version", version); - public SourceRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType); - public SourceRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetSourceRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source); + public GetSourceRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes); + public GetSourceRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes); + public GetSourceRequestDescriptor Preference(string? preference) => Qs("preference", preference); + public GetSourceRequestDescriptor Realtime(bool? realtime = true) => Qs("realtime", realtime); + public GetSourceRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh); + public GetSourceRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing); + public GetSourceRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields); + public GetSourceRequestDescriptor Version(long? version) => Qs("version", version); + public GetSourceRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType); + public GetSourceRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; } - public SourceRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public GetSourceRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; @@ -161,37 +161,37 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class SourceRequestDescriptor : RequestDescriptor +public sealed partial class GetSourceRequestDescriptor : RequestDescriptor { - internal SourceRequestDescriptor(Action configure) => configure.Invoke(this); - public SourceRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id)) + internal GetSourceRequestDescriptor(Action configure) => configure.Invoke(this); + public GetSourceRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id)) { } - internal SourceRequestDescriptor() + internal GetSourceRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetSource; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public SourceRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source); - public SourceRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes); - public SourceRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes); - public SourceRequestDescriptor Preference(string? preference) => Qs("preference", preference); - public SourceRequestDescriptor Realtime(bool? realtime = true) => Qs("realtime", realtime); - public SourceRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh); - public SourceRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing); - public SourceRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields); - public SourceRequestDescriptor Version(long? version) => Qs("version", version); - public SourceRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType); - public SourceRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetSourceRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source); + public GetSourceRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes); + public GetSourceRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes); + public GetSourceRequestDescriptor Preference(string? preference) => Qs("preference", preference); + public GetSourceRequestDescriptor Realtime(bool? realtime = true) => Qs("realtime", realtime); + public GetSourceRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh); + public GetSourceRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing); + public GetSourceRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields); + public GetSourceRequestDescriptor Version(long? version) => Qs("version", version); + public GetSourceRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType); + public GetSourceRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; } - public SourceRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public GetSourceRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SourceResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceResponse.g.cs similarity index 94% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/SourceResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceResponse.g.cs index 50eef988a3b..de84738cfda 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SourceResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceResponse.g.cs @@ -23,6 +23,6 @@ #nullable restore namespace Elastic.Clients.Elasticsearch; -public sealed partial class SourceResponse : ElasticsearchResponse +public sealed partial class GetSourceResponse : ElasticsearchResponse { } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexRequest.g.cs similarity index 64% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexRequest.g.cs index 1142c959a29..496fec3723e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class SplitRequestParameters : RequestParameters +public sealed class CloneIndexRequestParameters : RequestParameters { [JsonIgnore] public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } @@ -39,13 +39,13 @@ public sealed class SplitRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q("wait_for_active_shards"); set => Q("wait_for_active_shards", value); } } -public sealed partial class SplitRequest : PlainRequest +public sealed partial class CloneIndexRequest : PlainRequest { - public SplitRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) + public CloneIndexRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target)) { } - internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit; + internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; [JsonIgnore] @@ -66,30 +66,30 @@ public SplitRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clien public Dictionary? Settings { get; set; } } -public sealed partial class SplitRequestDescriptor : RequestDescriptor, SplitRequestParameters> +public sealed partial class CloneIndexRequestDescriptor : RequestDescriptor, CloneIndexRequestParameters> { - internal SplitRequestDescriptor(Action> configure) => configure.Invoke(this); - public SplitRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) + internal CloneIndexRequestDescriptor(Action> configure) => configure.Invoke(this); + public CloneIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target)) { } - internal SplitRequestDescriptor() + internal CloneIndexRequestDescriptor() { } - internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit; + internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; - public SplitRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public SplitRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public SplitRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public SplitRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public CloneIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public CloneIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public CloneIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public CloneIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; } - public SplitRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName target) + public CloneIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.Name target) { RouteValues.Required("target", target); return Self; @@ -99,13 +99,13 @@ public SplitRequestDescriptor Target(Elastic.Clients.Elasticsearch.In private Dictionary? SettingsValue { get; set; } - public SplitRequestDescriptor Aliases(Func, FluentDictionary> selector) + public CloneIndexRequestDescriptor Aliases(Func, FluentDictionary> selector) { AliasesValue = selector?.Invoke(new FluentDictionary()); return Self; } - public SplitRequestDescriptor Settings(Func, FluentDictionary> selector) + public CloneIndexRequestDescriptor Settings(Func, FluentDictionary> selector) { SettingsValue = selector?.Invoke(new FluentDictionary()); return Self; @@ -130,30 +130,30 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class SplitRequestDescriptor : RequestDescriptor +public sealed partial class CloneIndexRequestDescriptor : RequestDescriptor { - internal SplitRequestDescriptor(Action configure) => configure.Invoke(this); - public SplitRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) + internal CloneIndexRequestDescriptor(Action configure) => configure.Invoke(this); + public CloneIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target)) { } - internal SplitRequestDescriptor() + internal CloneIndexRequestDescriptor() { } - internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit; + internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; - public SplitRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public SplitRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public SplitRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public SplitRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public CloneIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public CloneIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public CloneIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public CloneIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; } - public SplitRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName target) + public CloneIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.Name target) { RouteValues.Required("target", target); return Self; @@ -163,13 +163,13 @@ public SplitRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName tar private Dictionary? SettingsValue { get; set; } - public SplitRequestDescriptor Aliases(Func, FluentDictionary> selector) + public CloneIndexRequestDescriptor Aliases(Func, FluentDictionary> selector) { AliasesValue = selector?.Invoke(new FluentDictionary()); return Self; } - public SplitRequestDescriptor Settings(Func, FluentDictionary> selector) + public CloneIndexRequestDescriptor Settings(Func, FluentDictionary> selector) { SettingsValue = selector?.Invoke(new FluentDictionary()); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs index a26cd09e1f2..cd19af220c9 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class CreateResponse : ElasticsearchResponse +public sealed partial class CloneIndexResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexRequest.g.cs similarity index 59% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexRequest.g.cs index e27eacabe97..f9c71bd7f89 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class CloseRequestParameters : RequestParameters +public sealed class CloseIndexRequestParameters : RequestParameters { [JsonIgnore] public bool? AllowNoIndices { get => Q("allow_no_indices"); set => Q("allow_no_indices", value); } @@ -48,9 +48,9 @@ public sealed class CloseRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q("wait_for_active_shards"); set => Q("wait_for_active_shards", value); } } -public sealed partial class CloseRequest : PlainRequest +public sealed partial class CloseIndexRequest : PlainRequest { - public CloseRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + public CloseIndexRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } @@ -76,27 +76,27 @@ public CloseRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q("wait_for_active_shards"); set => Q("wait_for_active_shards", value); } } -public sealed partial class CloseRequestDescriptor : RequestDescriptor, CloseRequestParameters> +public sealed partial class CloseIndexRequestDescriptor : RequestDescriptor, CloseIndexRequestParameters> { - internal CloseRequestDescriptor(Action> configure) => configure.Invoke(this); - public CloseRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + internal CloseIndexRequestDescriptor(Action> configure) => configure.Invoke(this); + public CloseIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } - internal CloseRequestDescriptor() + internal CloseIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClose; internal override HttpMethod HttpMethod => HttpMethod.POST; internal override bool SupportsBody => false; - public CloseRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public CloseRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public CloseRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public CloseRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public CloseRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public CloseRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public CloseRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) + public CloseIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public CloseIndexRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public CloseIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public CloseIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public CloseIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public CloseIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public CloseIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) { RouteValues.Required("index", indices); return Self; @@ -107,27 +107,27 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class CloseRequestDescriptor : RequestDescriptor +public sealed partial class CloseIndexRequestDescriptor : RequestDescriptor { - internal CloseRequestDescriptor(Action configure) => configure.Invoke(this); - public CloseRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + internal CloseIndexRequestDescriptor(Action configure) => configure.Invoke(this); + public CloseIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } - internal CloseRequestDescriptor() + internal CloseIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClose; internal override HttpMethod HttpMethod => HttpMethod.POST; internal override bool SupportsBody => false; - public CloseRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public CloseRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public CloseRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public CloseRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public CloseRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public CloseRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public CloseRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) + public CloseIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public CloseIndexRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public CloseIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public CloseIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public CloseIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public CloseIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public CloseIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) { RouteValues.Required("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs index d69ee34fc3e..12505daf7f8 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class CloseResponse : ElasticsearchResponse +public sealed partial class CloseIndexResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexRequest.g.cs similarity index 69% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexRequest.g.cs index 762b4311106..1576bf4be27 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class CreateRequestParameters : RequestParameters +public sealed class CreateIndexRequestParameters : RequestParameters { [JsonIgnore] public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } @@ -39,9 +39,9 @@ public sealed class CreateRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q("wait_for_active_shards"); set => Q("wait_for_active_shards", value); } } -public sealed partial class CreateRequest : PlainRequest +public sealed partial class CreateIndexRequest : PlainRequest { - public CreateRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index)) + public CreateIndexRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index)) { } @@ -70,28 +70,28 @@ public CreateRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r => public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Settings { get; set; } } -public sealed partial class CreateRequestDescriptor : RequestDescriptor, CreateRequestParameters> +public sealed partial class CreateIndexRequestDescriptor : RequestDescriptor, CreateIndexRequestParameters> { - internal CreateRequestDescriptor(Action> configure) => configure.Invoke(this); - public CreateRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index)) + internal CreateIndexRequestDescriptor(Action> configure) => configure.Invoke(this); + public CreateIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index)) { } - public CreateRequestDescriptor(TDocument document) : this(typeof(TDocument)) + public CreateIndexRequestDescriptor(TDocument document) : this(typeof(TDocument)) { } - internal CreateRequestDescriptor() + internal CreateIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreate; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; - public CreateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public CreateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public CreateRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public CreateRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public CreateIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public CreateIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public CreateIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public CreateIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; @@ -111,7 +111,7 @@ public CreateRequestDescriptor Index(Elastic.Clients.Elasticsearch.In private Dictionary? AliasesValue { get; set; } - public CreateRequestDescriptor Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings) + public CreateIndexRequestDescriptor Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings) { MappingsDescriptor = null; MappingsDescriptorAction = null; @@ -119,7 +119,7 @@ public CreateRequestDescriptor Mappings(Elastic.Clients.Elasticsearch return Self; } - public CreateRequestDescriptor Mappings(Mapping.TypeMappingDescriptor descriptor) + public CreateIndexRequestDescriptor Mappings(Mapping.TypeMappingDescriptor descriptor) { MappingsValue = null; MappingsDescriptorAction = null; @@ -127,7 +127,7 @@ public CreateRequestDescriptor Mappings(Mapping.TypeMappingDescriptor return Self; } - public CreateRequestDescriptor Mappings(Action> configure) + public CreateIndexRequestDescriptor Mappings(Action> configure) { MappingsValue = null; MappingsDescriptor = null; @@ -135,7 +135,7 @@ public CreateRequestDescriptor Mappings(Action Settings(Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? settings) + public CreateIndexRequestDescriptor Settings(Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? settings) { SettingsDescriptor = null; SettingsDescriptorAction = null; @@ -143,7 +143,7 @@ public CreateRequestDescriptor Settings(Elastic.Clients.Elasticsearch return Self; } - public CreateRequestDescriptor Settings(IndexSettingsDescriptor descriptor) + public CreateIndexRequestDescriptor Settings(IndexSettingsDescriptor descriptor) { SettingsValue = null; SettingsDescriptorAction = null; @@ -151,7 +151,7 @@ public CreateRequestDescriptor Settings(IndexSettingsDescriptor Settings(Action> configure) + public CreateIndexRequestDescriptor Settings(Action> configure) { SettingsValue = null; SettingsDescriptor = null; @@ -159,7 +159,7 @@ public CreateRequestDescriptor Settings(Action Aliases(Func, FluentDictionary> selector) + public CreateIndexRequestDescriptor Aliases(Func, FluentDictionary> selector) { AliasesValue = selector?.Invoke(new FluentDictionary()); return Self; @@ -210,24 +210,24 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class CreateRequestDescriptor : RequestDescriptor +public sealed partial class CreateIndexRequestDescriptor : RequestDescriptor { - internal CreateRequestDescriptor(Action configure) => configure.Invoke(this); - public CreateRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index)) + internal CreateIndexRequestDescriptor(Action configure) => configure.Invoke(this); + public CreateIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index)) { } - internal CreateRequestDescriptor() + internal CreateIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreate; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; - public CreateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public CreateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public CreateRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public CreateRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public CreateIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public CreateIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public CreateIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public CreateIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; @@ -247,7 +247,7 @@ public CreateRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName ind private Dictionary? AliasesValue { get; set; } - public CreateRequestDescriptor Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings) + public CreateIndexRequestDescriptor Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings) { MappingsDescriptor = null; MappingsDescriptorAction = null; @@ -255,7 +255,7 @@ public CreateRequestDescriptor Mappings(Elastic.Clients.Elasticsearch.Mapping.Ty return Self; } - public CreateRequestDescriptor Mappings(Mapping.TypeMappingDescriptor descriptor) + public CreateIndexRequestDescriptor Mappings(Mapping.TypeMappingDescriptor descriptor) { MappingsValue = null; MappingsDescriptorAction = null; @@ -263,7 +263,7 @@ public CreateRequestDescriptor Mappings(Mapping.TypeMappingDescriptor descriptor return Self; } - public CreateRequestDescriptor Mappings(Action configure) + public CreateIndexRequestDescriptor Mappings(Action configure) { MappingsValue = null; MappingsDescriptor = null; @@ -271,7 +271,7 @@ public CreateRequestDescriptor Mappings(Action co return Self; } - public CreateRequestDescriptor Settings(Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? settings) + public CreateIndexRequestDescriptor Settings(Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? settings) { SettingsDescriptor = null; SettingsDescriptorAction = null; @@ -279,7 +279,7 @@ public CreateRequestDescriptor Settings(Elastic.Clients.Elasticsearch.IndexManag return Self; } - public CreateRequestDescriptor Settings(IndexSettingsDescriptor descriptor) + public CreateIndexRequestDescriptor Settings(IndexSettingsDescriptor descriptor) { SettingsValue = null; SettingsDescriptorAction = null; @@ -287,7 +287,7 @@ public CreateRequestDescriptor Settings(IndexSettingsDescriptor descriptor) return Self; } - public CreateRequestDescriptor Settings(Action configure) + public CreateIndexRequestDescriptor Settings(Action configure) { SettingsValue = null; SettingsDescriptor = null; @@ -295,7 +295,7 @@ public CreateRequestDescriptor Settings(Action configur return Self; } - public CreateRequestDescriptor Aliases(Func, FluentDictionary> selector) + public CreateIndexRequestDescriptor Aliases(Func, FluentDictionary> selector) { AliasesValue = selector?.Invoke(new FluentDictionary()); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs index b72df10c076..00bee8b54c7 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class ShrinkResponse : ElasticsearchResponse +public sealed partial class CreateIndexResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexRequest.g.cs similarity index 60% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexRequest.g.cs index 85748e17348..bebfe788276 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class DeleteRequestParameters : RequestParameters +public sealed class DeleteIndexRequestParameters : RequestParameters { [JsonIgnore] public bool? AllowNoIndices { get => Q("allow_no_indices"); set => Q("allow_no_indices", value); } @@ -45,9 +45,9 @@ public sealed class DeleteRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q("timeout"); set => Q("timeout", value); } } -public sealed partial class DeleteRequest : PlainRequest +public sealed partial class DeleteIndexRequest : PlainRequest { - public DeleteRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + public DeleteIndexRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } @@ -70,26 +70,26 @@ public DeleteRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q("timeout"); set => Q("timeout", value); } } -public sealed partial class DeleteRequestDescriptor : RequestDescriptor, DeleteRequestParameters> +public sealed partial class DeleteIndexRequestDescriptor : RequestDescriptor, DeleteIndexRequestParameters> { - internal DeleteRequestDescriptor(Action> configure) => configure.Invoke(this); - public DeleteRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + internal DeleteIndexRequestDescriptor(Action> configure) => configure.Invoke(this); + public DeleteIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } - internal DeleteRequestDescriptor() + internal DeleteIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDelete; internal override HttpMethod HttpMethod => HttpMethod.DELETE; internal override bool SupportsBody => false; - public DeleteRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public DeleteRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public DeleteRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public DeleteRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public DeleteRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public DeleteRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) + public DeleteIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public DeleteIndexRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public DeleteIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public DeleteIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public DeleteIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public DeleteIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) { RouteValues.Required("index", indices); return Self; @@ -100,26 +100,26 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class DeleteRequestDescriptor : RequestDescriptor +public sealed partial class DeleteIndexRequestDescriptor : RequestDescriptor { - internal DeleteRequestDescriptor(Action configure) => configure.Invoke(this); - public DeleteRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + internal DeleteIndexRequestDescriptor(Action configure) => configure.Invoke(this); + public DeleteIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } - internal DeleteRequestDescriptor() + internal DeleteIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDelete; internal override HttpMethod HttpMethod => HttpMethod.DELETE; internal override bool SupportsBody => false; - public DeleteRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public DeleteRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public DeleteRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public DeleteRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public DeleteRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public DeleteRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) + public DeleteIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public DeleteIndexRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public DeleteIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public DeleteIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public DeleteIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public DeleteIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) { RouteValues.Required("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs index ea165540b73..503ad4c76b4 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class DeleteResponse : ElasticsearchResponse +public sealed partial class DeleteIndexResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AliasRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasRequest.g.cs similarity index 54% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AliasRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasRequest.g.cs index 7f854976f4d..d52ab9ce500 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AliasRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class AliasRequestParameters : RequestParameters +public sealed class GetAliasRequestParameters : RequestParameters { [JsonIgnore] public bool? AllowNoIndices { get => Q("allow_no_indices"); set => Q("allow_no_indices", value); } @@ -42,21 +42,21 @@ public sealed class AliasRequestParameters : RequestParameters public bool? Local { get => Q("local"); set => Q("local", value); } } -public sealed partial class AliasRequest : PlainRequest +public sealed partial class GetAliasRequest : PlainRequest { - public AliasRequest() + public GetAliasRequest() { } - public AliasRequest(Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("name", name)) + public GetAliasRequest(Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("name", name)) { } - public AliasRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("index", indices).Optional("name", name)) + public GetAliasRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("index", indices).Optional("name", name)) { } - public AliasRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public GetAliasRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } @@ -76,35 +76,35 @@ public AliasRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => public bool? Local { get => Q("local"); set => Q("local", value); } } -public sealed partial class AliasRequestDescriptor : RequestDescriptor, AliasRequestParameters> +public sealed partial class GetAliasRequestDescriptor : RequestDescriptor, GetAliasRequestParameters> { - internal AliasRequestDescriptor(Action> configure) => configure.Invoke(this); - public AliasRequestDescriptor() + internal GetAliasRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetAliasRequestDescriptor() { } - public AliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("index", indices).Optional("name", name)) + public GetAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("index", indices).Optional("name", name)) { } - public AliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public GetAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetAlias; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public AliasRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public AliasRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public AliasRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public AliasRequestDescriptor Local(bool? local = true) => Qs("local", local); - public AliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name) + public GetAliasRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public GetAliasRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetAliasRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public GetAliasRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name) { RouteValues.Optional("name", name); return Self; } - public AliasRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public GetAliasRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; @@ -115,35 +115,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class AliasRequestDescriptor : RequestDescriptor +public sealed partial class GetAliasRequestDescriptor : RequestDescriptor { - internal AliasRequestDescriptor(Action configure) => configure.Invoke(this); - public AliasRequestDescriptor() + internal GetAliasRequestDescriptor(Action configure) => configure.Invoke(this); + public GetAliasRequestDescriptor() { } - public AliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("index", indices).Optional("name", name)) + public GetAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("index", indices).Optional("name", name)) { } - public AliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public GetAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetAlias; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public AliasRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public AliasRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public AliasRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public AliasRequestDescriptor Local(bool? local = true) => Qs("local", local); - public AliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name) + public GetAliasRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public GetAliasRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetAliasRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public GetAliasRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name) { RouteValues.Optional("name", name); return Self; } - public AliasRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public GetAliasRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasResponse.g.cs similarity index 79% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasResponse.g.cs index 847cf9bf2ff..cdeadf2741f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasResponse.g.cs @@ -23,13 +23,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class GetResponse : DictionaryResponse +public sealed partial class GetAliasResponse : DictionaryResponse { - public GetResponse(IReadOnlyDictionary dictionary) : base(dictionary) + public GetAliasResponse(IReadOnlyDictionary dictionary) : base(dictionary) { } - public GetResponse() : base() + public GetAliasResponse() : base() { } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamRequest.g.cs similarity index 74% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamRequest.g.cs index 85f25edce10..8c83044e05c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamRequest.g.cs @@ -27,19 +27,19 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class DataStreamRequestParameters : RequestParameters +public sealed class GetDataStreamRequestParameters : RequestParameters { [JsonIgnore] public ICollection? ExpandWildcards { get => Q?>("expand_wildcards"); set => Q("expand_wildcards", value); } } -public sealed partial class DataStreamRequest : PlainRequest +public sealed partial class GetDataStreamRequest : PlainRequest { - public DataStreamRequest() + public GetDataStreamRequest() { } - public DataStreamRequest(Elastic.Clients.Elasticsearch.DataStreamNames? name) : base(r => r.Optional("name", name)) + public GetDataStreamRequest(Elastic.Clients.Elasticsearch.DataStreamNames? name) : base(r => r.Optional("name", name)) { } @@ -50,18 +50,18 @@ public DataStreamRequest(Elastic.Clients.Elasticsearch.DataStreamNames? name) : public ICollection? ExpandWildcards { get => Q?>("expand_wildcards"); set => Q("expand_wildcards", value); } } -public sealed partial class DataStreamRequestDescriptor : RequestDescriptor +public sealed partial class GetDataStreamRequestDescriptor : RequestDescriptor { - internal DataStreamRequestDescriptor(Action configure) => configure.Invoke(this); - public DataStreamRequestDescriptor() + internal GetDataStreamRequestDescriptor(Action configure) => configure.Invoke(this); + public GetDataStreamRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetDataStream; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public DataStreamRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public DataStreamRequestDescriptor Name(Elastic.Clients.Elasticsearch.DataStreamNames? name) + public GetDataStreamRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetDataStreamRequestDescriptor Name(Elastic.Clients.Elasticsearch.DataStreamNames? name) { RouteValues.Optional("name", name); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs index bdbbe7e4d14..4afd7b7f01b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DataStreamResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class DataStreamResponse : ElasticsearchResponse +public sealed partial class GetDataStreamResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("data_streams")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldMappingRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingRequest.g.cs similarity index 54% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldMappingRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingRequest.g.cs index 201d7a0970d..a1fb7240355 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldMappingRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class FieldMappingRequestParameters : RequestParameters +public sealed class GetFieldMappingRequestParameters : RequestParameters { [JsonIgnore] public bool? AllowNoIndices { get => Q("allow_no_indices"); set => Q("allow_no_indices", value); } @@ -45,13 +45,13 @@ public sealed class FieldMappingRequestParameters : RequestParameters public bool? Local { get => Q("local"); set => Q("local", value); } } -public sealed partial class FieldMappingRequest : PlainRequest +public sealed partial class GetFieldMappingRequest : PlainRequest { - public FieldMappingRequest(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields)) + public GetFieldMappingRequest(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields)) { } - public FieldMappingRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Optional("index", indices).Required("fields", fields)) + public GetFieldMappingRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Optional("index", indices).Required("fields", fields)) { } @@ -74,36 +74,36 @@ public FieldMappingRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elast public bool? Local { get => Q("local"); set => Q("local", value); } } -public sealed partial class FieldMappingRequestDescriptor : RequestDescriptor, FieldMappingRequestParameters> +public sealed partial class GetFieldMappingRequestDescriptor : RequestDescriptor, GetFieldMappingRequestParameters> { - internal FieldMappingRequestDescriptor(Action> configure) => configure.Invoke(this); - public FieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields)) + internal GetFieldMappingRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetFieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields)) { } - public FieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Optional("index", indices).Required("fields", fields)) + public GetFieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Optional("index", indices).Required("fields", fields)) { } - internal FieldMappingRequestDescriptor() + internal GetFieldMappingRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetFieldMapping; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public FieldMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public FieldMappingRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public FieldMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public FieldMappingRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults); - public FieldMappingRequestDescriptor Local(bool? local = true) => Qs("local", local); - public FieldMappingRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields fields) + public GetFieldMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public GetFieldMappingRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetFieldMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public GetFieldMappingRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults); + public GetFieldMappingRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetFieldMappingRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields fields) { RouteValues.Required("fields", fields); return Self; } - public FieldMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public GetFieldMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; @@ -114,36 +114,36 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class FieldMappingRequestDescriptor : RequestDescriptor +public sealed partial class GetFieldMappingRequestDescriptor : RequestDescriptor { - internal FieldMappingRequestDescriptor(Action configure) => configure.Invoke(this); - public FieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields)) + internal GetFieldMappingRequestDescriptor(Action configure) => configure.Invoke(this); + public GetFieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields)) { } - public FieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Optional("index", indices).Required("fields", fields)) + public GetFieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Optional("index", indices).Required("fields", fields)) { } - internal FieldMappingRequestDescriptor() + internal GetFieldMappingRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetFieldMapping; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public FieldMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public FieldMappingRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public FieldMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public FieldMappingRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults); - public FieldMappingRequestDescriptor Local(bool? local = true) => Qs("local", local); - public FieldMappingRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields fields) + public GetFieldMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public GetFieldMappingRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetFieldMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public GetFieldMappingRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults); + public GetFieldMappingRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetFieldMappingRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields fields) { RouteValues.Required("fields", fields); return Self; } - public FieldMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public GetFieldMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingResponse.g.cs similarity index 78% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldMappingResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingResponse.g.cs index efb4695658b..906bb965b78 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FieldMappingResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingResponse.g.cs @@ -23,13 +23,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class FieldMappingResponse : DictionaryResponse +public sealed partial class GetFieldMappingResponse : DictionaryResponse { - public FieldMappingResponse(IReadOnlyDictionary dictionary) : base(dictionary) + public GetFieldMappingResponse(IReadOnlyDictionary dictionary) : base(dictionary) { } - public FieldMappingResponse() : base() + public GetFieldMappingResponse() : base() { } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexRequest.g.cs similarity index 59% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexRequest.g.cs index 8b6cddfc8c4..b30f633fc0e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class GetRequestParameters : RequestParameters +public sealed class GetIndexRequestParameters : RequestParameters { [JsonIgnore] public bool? AllowNoIndices { get => Q("allow_no_indices"); set => Q("allow_no_indices", value); } @@ -54,9 +54,9 @@ public sealed class GetRequestParameters : RequestParameters public ICollection? Features { get => Q?>("features"); set => Q("features", value); } } -public sealed partial class GetRequest : PlainRequest +public sealed partial class GetIndexRequest : PlainRequest { - public GetRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + public GetIndexRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } @@ -88,29 +88,29 @@ public GetRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.R public ICollection? Features { get => Q?>("features"); set => Q("features", value); } } -public sealed partial class GetRequestDescriptor : RequestDescriptor, GetRequestParameters> +public sealed partial class GetIndexRequestDescriptor : RequestDescriptor, GetIndexRequestParameters> { - internal GetRequestDescriptor(Action> configure) => configure.Invoke(this); - public GetRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + internal GetIndexRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } - internal GetRequestDescriptor() + internal GetIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGet; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public GetRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public GetRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public GetRequestDescriptor Features(ICollection? features) => Qs("features", features); - public GetRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings); - public GetRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public GetRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults); - public GetRequestDescriptor Local(bool? local = true) => Qs("local", local); - public GetRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public GetRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) + public GetIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public GetIndexRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetIndexRequestDescriptor Features(ICollection? features) => Qs("features", features); + public GetIndexRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings); + public GetIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public GetIndexRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults); + public GetIndexRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public GetIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) { RouteValues.Required("index", indices); return Self; @@ -121,29 +121,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class GetRequestDescriptor : RequestDescriptor +public sealed partial class GetIndexRequestDescriptor : RequestDescriptor { - internal GetRequestDescriptor(Action configure) => configure.Invoke(this); - public GetRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + internal GetIndexRequestDescriptor(Action configure) => configure.Invoke(this); + public GetIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } - internal GetRequestDescriptor() + internal GetIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGet; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public GetRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public GetRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public GetRequestDescriptor Features(ICollection? features) => Qs("features", features); - public GetRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings); - public GetRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public GetRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults); - public GetRequestDescriptor Local(bool? local = true) => Qs("local", local); - public GetRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public GetRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) + public GetIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public GetIndexRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetIndexRequestDescriptor Features(ICollection? features) => Qs("features", features); + public GetIndexRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings); + public GetIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public GetIndexRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults); + public GetIndexRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public GetIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) { RouteValues.Required("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexResponse.g.cs similarity index 79% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AliasResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexResponse.g.cs index b706987a7dd..953e39844e0 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/AliasResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexResponse.g.cs @@ -23,13 +23,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class AliasResponse : DictionaryResponse +public sealed partial class GetIndexResponse : DictionaryResponse { - public AliasResponse(IReadOnlyDictionary dictionary) : base(dictionary) + public GetIndexResponse(IReadOnlyDictionary dictionary) : base(dictionary) { } - public AliasResponse() : base() + public GetIndexResponse() : base() { } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateRequest.g.cs similarity index 72% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateRequest.g.cs index f4e9b6517b1..baf6573e219 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class IndexTemplateRequestParameters : RequestParameters +public sealed class GetIndexTemplateRequestParameters : RequestParameters { [JsonIgnore] public bool? Local { get => Q("local"); set => Q("local", value); } @@ -39,13 +39,13 @@ public sealed class IndexTemplateRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } } -public sealed partial class IndexTemplateRequest : PlainRequest +public sealed partial class GetIndexTemplateRequest : PlainRequest { - public IndexTemplateRequest() + public GetIndexTemplateRequest() { } - public IndexTemplateRequest(Elastic.Clients.Elasticsearch.Name? name) : base(r => r.Optional("name", name)) + public GetIndexTemplateRequest(Elastic.Clients.Elasticsearch.Name? name) : base(r => r.Optional("name", name)) { } @@ -62,20 +62,20 @@ public IndexTemplateRequest(Elastic.Clients.Elasticsearch.Name? name) : base(r = public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } } -public sealed partial class IndexTemplateRequestDescriptor : RequestDescriptor +public sealed partial class GetIndexTemplateRequestDescriptor : RequestDescriptor { - internal IndexTemplateRequestDescriptor(Action configure) => configure.Invoke(this); - public IndexTemplateRequestDescriptor() + internal GetIndexTemplateRequestDescriptor(Action configure) => configure.Invoke(this); + public GetIndexTemplateRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetIndexTemplate; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public IndexTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings); - public IndexTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local); - public IndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public IndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name? name) + public GetIndexTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings); + public GetIndexTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public GetIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name? name) { RouteValues.Optional("name", name); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs index 082d45f240b..c9ac3bb88ba 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class IndexTemplateResponse : ElasticsearchResponse +public sealed partial class GetIndexTemplateResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("index_templates")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingRequest.g.cs similarity index 62% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingRequest.g.cs index 053d9ff8c40..dd84a7e49ed 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class MappingRequestParameters : RequestParameters +public sealed class GetMappingRequestParameters : RequestParameters { [JsonIgnore] public bool? AllowNoIndices { get => Q("allow_no_indices"); set => Q("allow_no_indices", value); } @@ -45,13 +45,13 @@ public sealed class MappingRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } } -public sealed partial class MappingRequest : PlainRequest +public sealed partial class GetMappingRequest : PlainRequest { - public MappingRequest() + public GetMappingRequest() { } - public MappingRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public GetMappingRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } @@ -74,22 +74,22 @@ public MappingRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r = public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } } -public sealed partial class MappingRequestDescriptor : RequestDescriptor, MappingRequestParameters> +public sealed partial class GetMappingRequestDescriptor : RequestDescriptor, GetMappingRequestParameters> { - internal MappingRequestDescriptor(Action> configure) => configure.Invoke(this); - public MappingRequestDescriptor() + internal GetMappingRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetMappingRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetMapping; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public MappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public MappingRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public MappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public MappingRequestDescriptor Local(bool? local = true) => Qs("local", local); - public MappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public MappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public GetMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public GetMappingRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public GetMappingRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetMappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public GetMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; @@ -100,22 +100,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class MappingRequestDescriptor : RequestDescriptor +public sealed partial class GetMappingRequestDescriptor : RequestDescriptor { - internal MappingRequestDescriptor(Action configure) => configure.Invoke(this); - public MappingRequestDescriptor() + internal GetMappingRequestDescriptor(Action configure) => configure.Invoke(this); + public GetMappingRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetMapping; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public MappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public MappingRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public MappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public MappingRequestDescriptor Local(bool? local = true) => Qs("local", local); - public MappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public MappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public GetMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public GetMappingRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public GetMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public GetMappingRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetMappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public GetMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingResponse.g.cs similarity index 78% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingResponse.g.cs index e63bf59ae7c..221c9f45677 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingResponse.g.cs @@ -23,13 +23,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class MappingResponse : DictionaryResponse +public sealed partial class GetMappingResponse : DictionaryResponse { - public MappingResponse(IReadOnlyDictionary dictionary) : base(dictionary) + public GetMappingResponse(IReadOnlyDictionary dictionary) : base(dictionary) { } - public MappingResponse() : base() + public GetMappingResponse() : base() { } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs similarity index 74% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs index 97dd2192809..0dc94ab8803 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class TemplateRequestParameters : RequestParameters +public sealed class GetTemplateRequestParameters : RequestParameters { [JsonIgnore] public bool? FlatSettings { get => Q("flat_settings"); set => Q("flat_settings", value); } @@ -39,13 +39,13 @@ public sealed class TemplateRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } } -public sealed partial class TemplateRequest : PlainRequest +public sealed partial class GetTemplateRequest : PlainRequest { - public TemplateRequest() + public GetTemplateRequest() { } - public TemplateRequest(Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("name", name)) + public GetTemplateRequest(Elastic.Clients.Elasticsearch.Names? name) : base(r => r.Optional("name", name)) { } @@ -62,20 +62,20 @@ public TemplateRequest(Elastic.Clients.Elasticsearch.Names? name) : base(r => r. public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } } -public sealed partial class TemplateRequestDescriptor : RequestDescriptor +public sealed partial class GetTemplateRequestDescriptor : RequestDescriptor { - internal TemplateRequestDescriptor(Action configure) => configure.Invoke(this); - public TemplateRequestDescriptor() + internal GetTemplateRequestDescriptor(Action configure) => configure.Invoke(this); + public GetTemplateRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetTemplate; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public TemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings); - public TemplateRequestDescriptor Local(bool? local = true) => Qs("local", local); - public TemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public TemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name) + public GetTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings); + public GetTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local); + public GetTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public GetTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name) { RouteValues.Optional("name", name); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateResponse.g.cs similarity index 81% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateResponse.g.cs index 81f0850b4ba..c5c61e1168a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateResponse.g.cs @@ -23,13 +23,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class TemplateResponse : DictionaryResponse +public sealed partial class GetTemplateResponse : DictionaryResponse { - public TemplateResponse(IReadOnlyDictionary dictionary) : base(dictionary) + public GetTemplateResponse(IReadOnlyDictionary dictionary) : base(dictionary) { } - public TemplateResponse() : base() + public GetTemplateResponse() : base() { } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/StatsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsRequest.g.cs similarity index 53% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/StatsRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsRequest.g.cs index a45fd541755..31c0fbc3fb5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/StatsRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class StatsRequestParameters : RequestParameters +public sealed class IndicesStatsRequestParameters : RequestParameters { [JsonIgnore] public Elastic.Clients.Elasticsearch.Fields? CompletionFields { get => Q("completion_fields"); set => Q("completion_fields", value); } @@ -57,21 +57,21 @@ public sealed class StatsRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.Level? Level { get => Q("level"); set => Q("level", value); } } -public sealed partial class StatsRequest : PlainRequest +public sealed partial class IndicesStatsRequest : PlainRequest { - public StatsRequest() + public IndicesStatsRequest() { } - public StatsRequest(Elastic.Clients.Elasticsearch.Metrics? metric) : base(r => r.Optional("metric", metric)) + public IndicesStatsRequest(Elastic.Clients.Elasticsearch.Metrics? metric) : base(r => r.Optional("metric", metric)) { } - public StatsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public IndicesStatsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } - public StatsRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Metrics? metric) : base(r => r.Optional("index", indices).Optional("metric", metric)) + public IndicesStatsRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Metrics? metric) : base(r => r.Optional("index", indices).Optional("metric", metric)) { } @@ -106,40 +106,40 @@ public StatsRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clie public Elastic.Clients.Elasticsearch.Level? Level { get => Q("level"); set => Q("level", value); } } -public sealed partial class StatsRequestDescriptor : RequestDescriptor, StatsRequestParameters> +public sealed partial class IndicesStatsRequestDescriptor : RequestDescriptor, IndicesStatsRequestParameters> { - internal StatsRequestDescriptor(Action> configure) => configure.Invoke(this); - public StatsRequestDescriptor() + internal IndicesStatsRequestDescriptor(Action> configure) => configure.Invoke(this); + public IndicesStatsRequestDescriptor() { } - public StatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public IndicesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } - public StatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Metrics? metric) : base(r => r.Optional("index", indices).Optional("metric", metric)) + public IndicesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Metrics? metric) : base(r => r.Optional("index", indices).Optional("metric", metric)) { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementStats; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public StatsRequestDescriptor CompletionFields(Elastic.Clients.Elasticsearch.Fields? completionFields) => Qs("completion_fields", completionFields); - public StatsRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public StatsRequestDescriptor FielddataFields(Elastic.Clients.Elasticsearch.Fields? fielddataFields) => Qs("fielddata_fields", fielddataFields); - public StatsRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields? fields) => Qs("fields", fields); - public StatsRequestDescriptor ForbidClosedIndices(bool? forbidClosedIndices = true) => Qs("forbid_closed_indices", forbidClosedIndices); - public StatsRequestDescriptor Groups(ICollection? groups) => Qs("groups", groups); - public StatsRequestDescriptor IncludeSegmentFileSizes(bool? includeSegmentFileSizes = true) => Qs("include_segment_file_sizes", includeSegmentFileSizes); - public StatsRequestDescriptor IncludeUnloadedSegments(bool? includeUnloadedSegments = true) => Qs("include_unloaded_segments", includeUnloadedSegments); - public StatsRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level); - public StatsRequestDescriptor Metric(Elastic.Clients.Elasticsearch.Metrics? metric) + public IndicesStatsRequestDescriptor CompletionFields(Elastic.Clients.Elasticsearch.Fields? completionFields) => Qs("completion_fields", completionFields); + public IndicesStatsRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public IndicesStatsRequestDescriptor FielddataFields(Elastic.Clients.Elasticsearch.Fields? fielddataFields) => Qs("fielddata_fields", fielddataFields); + public IndicesStatsRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields? fields) => Qs("fields", fields); + public IndicesStatsRequestDescriptor ForbidClosedIndices(bool? forbidClosedIndices = true) => Qs("forbid_closed_indices", forbidClosedIndices); + public IndicesStatsRequestDescriptor Groups(ICollection? groups) => Qs("groups", groups); + public IndicesStatsRequestDescriptor IncludeSegmentFileSizes(bool? includeSegmentFileSizes = true) => Qs("include_segment_file_sizes", includeSegmentFileSizes); + public IndicesStatsRequestDescriptor IncludeUnloadedSegments(bool? includeUnloadedSegments = true) => Qs("include_unloaded_segments", includeUnloadedSegments); + public IndicesStatsRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level); + public IndicesStatsRequestDescriptor Metric(Elastic.Clients.Elasticsearch.Metrics? metric) { RouteValues.Optional("metric", metric); return Self; } - public StatsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public IndicesStatsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; @@ -150,40 +150,40 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class StatsRequestDescriptor : RequestDescriptor +public sealed partial class IndicesStatsRequestDescriptor : RequestDescriptor { - internal StatsRequestDescriptor(Action configure) => configure.Invoke(this); - public StatsRequestDescriptor() + internal IndicesStatsRequestDescriptor(Action configure) => configure.Invoke(this); + public IndicesStatsRequestDescriptor() { } - public StatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) + public IndicesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices)) { } - public StatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Metrics? metric) : base(r => r.Optional("index", indices).Optional("metric", metric)) + public IndicesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices, Elastic.Clients.Elasticsearch.Metrics? metric) : base(r => r.Optional("index", indices).Optional("metric", metric)) { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementStats; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public StatsRequestDescriptor CompletionFields(Elastic.Clients.Elasticsearch.Fields? completionFields) => Qs("completion_fields", completionFields); - public StatsRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public StatsRequestDescriptor FielddataFields(Elastic.Clients.Elasticsearch.Fields? fielddataFields) => Qs("fielddata_fields", fielddataFields); - public StatsRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields? fields) => Qs("fields", fields); - public StatsRequestDescriptor ForbidClosedIndices(bool? forbidClosedIndices = true) => Qs("forbid_closed_indices", forbidClosedIndices); - public StatsRequestDescriptor Groups(ICollection? groups) => Qs("groups", groups); - public StatsRequestDescriptor IncludeSegmentFileSizes(bool? includeSegmentFileSizes = true) => Qs("include_segment_file_sizes", includeSegmentFileSizes); - public StatsRequestDescriptor IncludeUnloadedSegments(bool? includeUnloadedSegments = true) => Qs("include_unloaded_segments", includeUnloadedSegments); - public StatsRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level); - public StatsRequestDescriptor Metric(Elastic.Clients.Elasticsearch.Metrics? metric) + public IndicesStatsRequestDescriptor CompletionFields(Elastic.Clients.Elasticsearch.Fields? completionFields) => Qs("completion_fields", completionFields); + public IndicesStatsRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public IndicesStatsRequestDescriptor FielddataFields(Elastic.Clients.Elasticsearch.Fields? fielddataFields) => Qs("fielddata_fields", fielddataFields); + public IndicesStatsRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields? fields) => Qs("fields", fields); + public IndicesStatsRequestDescriptor ForbidClosedIndices(bool? forbidClosedIndices = true) => Qs("forbid_closed_indices", forbidClosedIndices); + public IndicesStatsRequestDescriptor Groups(ICollection? groups) => Qs("groups", groups); + public IndicesStatsRequestDescriptor IncludeSegmentFileSizes(bool? includeSegmentFileSizes = true) => Qs("include_segment_file_sizes", includeSegmentFileSizes); + public IndicesStatsRequestDescriptor IncludeUnloadedSegments(bool? includeUnloadedSegments = true) => Qs("include_unloaded_segments", includeUnloadedSegments); + public IndicesStatsRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level); + public IndicesStatsRequestDescriptor Metric(Elastic.Clients.Elasticsearch.Metrics? metric) { RouteValues.Optional("metric", metric); return Self; } - public StatsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) + public IndicesStatsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices) { RouteValues.Optional("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/StatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/StatsResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs index 07321b106ae..9ff91654760 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/StatsResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class StatsResponse : ElasticsearchResponse +public sealed partial class IndicesStatsResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("_all")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexRequest.g.cs similarity index 59% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexRequest.g.cs index cedec179c4e..a56f87519d7 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class OpenRequestParameters : RequestParameters +public sealed class OpenIndexRequestParameters : RequestParameters { [JsonIgnore] public bool? AllowNoIndices { get => Q("allow_no_indices"); set => Q("allow_no_indices", value); } @@ -48,9 +48,9 @@ public sealed class OpenRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q("wait_for_active_shards"); set => Q("wait_for_active_shards", value); } } -public sealed partial class OpenRequest : PlainRequest +public sealed partial class OpenIndexRequest : PlainRequest { - public OpenRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + public OpenIndexRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } @@ -76,27 +76,27 @@ public OpenRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r. public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q("wait_for_active_shards"); set => Q("wait_for_active_shards", value); } } -public sealed partial class OpenRequestDescriptor : RequestDescriptor, OpenRequestParameters> +public sealed partial class OpenIndexRequestDescriptor : RequestDescriptor, OpenIndexRequestParameters> { - internal OpenRequestDescriptor(Action> configure) => configure.Invoke(this); - public OpenRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + internal OpenIndexRequestDescriptor(Action> configure) => configure.Invoke(this); + public OpenIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } - internal OpenRequestDescriptor() + internal OpenIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementOpen; internal override HttpMethod HttpMethod => HttpMethod.POST; internal override bool SupportsBody => false; - public OpenRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public OpenRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public OpenRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public OpenRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public OpenRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public OpenRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public OpenRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) + public OpenIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public OpenIndexRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public OpenIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public OpenIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public OpenIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public OpenIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public OpenIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) { RouteValues.Required("index", indices); return Self; @@ -107,27 +107,27 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class OpenRequestDescriptor : RequestDescriptor +public sealed partial class OpenIndexRequestDescriptor : RequestDescriptor { - internal OpenRequestDescriptor(Action configure) => configure.Invoke(this); - public OpenRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) + internal OpenIndexRequestDescriptor(Action configure) => configure.Invoke(this); + public OpenIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices)) { } - internal OpenRequestDescriptor() + internal OpenIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementOpen; internal override HttpMethod HttpMethod => HttpMethod.POST; internal override bool SupportsBody => false; - public OpenRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); - public OpenRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); - public OpenRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); - public OpenRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public OpenRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public OpenRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public OpenRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) + public OpenIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices); + public OpenIndexRequestDescriptor ExpandWildcards(ICollection? expandWildcards) => Qs("expand_wildcards", expandWildcards); + public OpenIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable); + public OpenIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public OpenIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public OpenIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public OpenIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices) { RouteValues.Required("index", indices); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs index 228a2650095..f885d774dc0 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class OpenResponse : ElasticsearchResponse +public sealed partial class OpenIndexResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs index 860cc0f9f35..f44110e997b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs @@ -53,7 +53,7 @@ public PutAliasRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Cl [JsonInclude] [JsonPropertyName("filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Filter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; } [JsonInclude] [JsonPropertyName("index_routing")] @@ -100,11 +100,11 @@ public PutAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.N return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; } @@ -114,7 +114,7 @@ public PutAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.N private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; } - public PutAliasRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public PutAliasRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -122,7 +122,7 @@ public PutAliasRequestDescriptor Filter(Elastic.Clients.Elasticsearch return Self; } - public PutAliasRequestDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public PutAliasRequestDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -130,7 +130,7 @@ public PutAliasRequestDescriptor Filter(QueryDsl.QueryContainerDescri return Self; } - public PutAliasRequestDescriptor Filter(Action> configure) + public PutAliasRequestDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -173,7 +173,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { @@ -237,11 +237,11 @@ public PutAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name) return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; } @@ -251,7 +251,7 @@ public PutAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name) private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; } - public PutAliasRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public PutAliasRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -259,7 +259,7 @@ public PutAliasRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Q return Self; } - public PutAliasRequestDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public PutAliasRequestDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -267,7 +267,7 @@ public PutAliasRequestDescriptor Filter(QueryDsl.QueryContainerDescriptor descri return Self; } - public PutAliasRequestDescriptor Filter(Action configure) + public PutAliasRequestDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -310,7 +310,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexRequest.g.cs similarity index 62% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexRequest.g.cs index 5c50a6e10d8..7df6013ae3d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class ShrinkRequestParameters : RequestParameters +public sealed class ShrinkIndexRequestParameters : RequestParameters { [JsonIgnore] public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } @@ -39,9 +39,9 @@ public sealed class ShrinkRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q("wait_for_active_shards"); set => Q("wait_for_active_shards", value); } } -public sealed partial class ShrinkRequest : PlainRequest +public sealed partial class ShrinkIndexRequest : PlainRequest { - public ShrinkRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) + public ShrinkIndexRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) { } @@ -66,30 +66,30 @@ public ShrinkRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie public Dictionary? Settings { get; set; } } -public sealed partial class ShrinkRequestDescriptor : RequestDescriptor, ShrinkRequestParameters> +public sealed partial class ShrinkIndexRequestDescriptor : RequestDescriptor, ShrinkIndexRequestParameters> { - internal ShrinkRequestDescriptor(Action> configure) => configure.Invoke(this); - public ShrinkRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) + internal ShrinkIndexRequestDescriptor(Action> configure) => configure.Invoke(this); + public ShrinkIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) { } - internal ShrinkRequestDescriptor() + internal ShrinkIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementShrink; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; - public ShrinkRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public ShrinkRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public ShrinkRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public ShrinkRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public ShrinkIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public ShrinkIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public ShrinkIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public ShrinkIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; } - public ShrinkRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName target) + public ShrinkIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName target) { RouteValues.Required("target", target); return Self; @@ -99,13 +99,13 @@ public ShrinkRequestDescriptor Target(Elastic.Clients.Elasticsearch.I private Dictionary? SettingsValue { get; set; } - public ShrinkRequestDescriptor Aliases(Func, FluentDictionary> selector) + public ShrinkIndexRequestDescriptor Aliases(Func, FluentDictionary> selector) { AliasesValue = selector?.Invoke(new FluentDictionary()); return Self; } - public ShrinkRequestDescriptor Settings(Func, FluentDictionary> selector) + public ShrinkIndexRequestDescriptor Settings(Func, FluentDictionary> selector) { SettingsValue = selector?.Invoke(new FluentDictionary()); return Self; @@ -130,30 +130,30 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class ShrinkRequestDescriptor : RequestDescriptor +public sealed partial class ShrinkIndexRequestDescriptor : RequestDescriptor { - internal ShrinkRequestDescriptor(Action configure) => configure.Invoke(this); - public ShrinkRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) + internal ShrinkIndexRequestDescriptor(Action configure) => configure.Invoke(this); + public ShrinkIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) { } - internal ShrinkRequestDescriptor() + internal ShrinkIndexRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementShrink; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; - public ShrinkRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public ShrinkRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public ShrinkRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public ShrinkRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public ShrinkIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public ShrinkIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public ShrinkIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public ShrinkIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; } - public ShrinkRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName target) + public ShrinkIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName target) { RouteValues.Required("target", target); return Self; @@ -163,13 +163,13 @@ public ShrinkRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName ta private Dictionary? SettingsValue { get; set; } - public ShrinkRequestDescriptor Aliases(Func, FluentDictionary> selector) + public ShrinkIndexRequestDescriptor Aliases(Func, FluentDictionary> selector) { AliasesValue = selector?.Invoke(new FluentDictionary()); return Self; } - public ShrinkRequestDescriptor Settings(Func, FluentDictionary> selector) + public ShrinkIndexRequestDescriptor Settings(Func, FluentDictionary> selector) { SettingsValue = selector?.Invoke(new FluentDictionary()); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs index bf5bf1e24bc..0057c2ae89c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class SplitResponse : ElasticsearchResponse +public sealed partial class ShrinkIndexResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexRequest.g.cs similarity index 63% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexRequest.g.cs index d227c426020..2d5cb946023 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed class CloneRequestParameters : RequestParameters +public sealed class SplitIndexRequestParameters : RequestParameters { [JsonIgnore] public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q("master_timeout"); set => Q("master_timeout", value); } @@ -39,13 +39,13 @@ public sealed class CloneRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q("wait_for_active_shards"); set => Q("wait_for_active_shards", value); } } -public sealed partial class CloneRequest : PlainRequest +public sealed partial class SplitIndexRequest : PlainRequest { - public CloneRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target)) + public SplitIndexRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) { } - internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone; + internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; [JsonIgnore] @@ -66,30 +66,30 @@ public CloneRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clien public Dictionary? Settings { get; set; } } -public sealed partial class CloneRequestDescriptor : RequestDescriptor, CloneRequestParameters> +public sealed partial class SplitIndexRequestDescriptor : RequestDescriptor, SplitIndexRequestParameters> { - internal CloneRequestDescriptor(Action> configure) => configure.Invoke(this); - public CloneRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target)) + internal SplitIndexRequestDescriptor(Action> configure) => configure.Invoke(this); + public SplitIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) { } - internal CloneRequestDescriptor() + internal SplitIndexRequestDescriptor() { } - internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone; + internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; - public CloneRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public CloneRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public CloneRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public CloneRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public SplitIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public SplitIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public SplitIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public SplitIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; } - public CloneRequestDescriptor Target(Elastic.Clients.Elasticsearch.Name target) + public SplitIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName target) { RouteValues.Required("target", target); return Self; @@ -99,13 +99,13 @@ public CloneRequestDescriptor Target(Elastic.Clients.Elasticsearch.Na private Dictionary? SettingsValue { get; set; } - public CloneRequestDescriptor Aliases(Func, FluentDictionary> selector) + public SplitIndexRequestDescriptor Aliases(Func, FluentDictionary> selector) { AliasesValue = selector?.Invoke(new FluentDictionary()); return Self; } - public CloneRequestDescriptor Settings(Func, FluentDictionary> selector) + public SplitIndexRequestDescriptor Settings(Func, FluentDictionary> selector) { SettingsValue = selector?.Invoke(new FluentDictionary()); return Self; @@ -130,30 +130,30 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class CloneRequestDescriptor : RequestDescriptor +public sealed partial class SplitIndexRequestDescriptor : RequestDescriptor { - internal CloneRequestDescriptor(Action configure) => configure.Invoke(this); - public CloneRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target)) + internal SplitIndexRequestDescriptor(Action configure) => configure.Invoke(this); + public SplitIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target)) { } - internal CloneRequestDescriptor() + internal SplitIndexRequestDescriptor() { } - internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone; + internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit; internal override HttpMethod HttpMethod => HttpMethod.PUT; internal override bool SupportsBody => true; - public CloneRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); - public CloneRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); - public CloneRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); - public CloneRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) + public SplitIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout); + public SplitIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout); + public SplitIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards); + public SplitIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index) { RouteValues.Required("index", index); return Self; } - public CloneRequestDescriptor Target(Elastic.Clients.Elasticsearch.Name target) + public SplitIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexName target) { RouteValues.Required("target", target); return Self; @@ -163,13 +163,13 @@ public CloneRequestDescriptor Target(Elastic.Clients.Elasticsearch.Name target) private Dictionary? SettingsValue { get; set; } - public CloneRequestDescriptor Aliases(Func, FluentDictionary> selector) + public SplitIndexRequestDescriptor Aliases(Func, FluentDictionary> selector) { AliasesValue = selector?.Invoke(new FluentDictionary()); return Self; } - public CloneRequestDescriptor Settings(Func, FluentDictionary> selector) + public SplitIndexRequestDescriptor Settings(Func, FluentDictionary> selector) { SettingsValue = selector?.Invoke(new FluentDictionary()); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs index 53a65188866..645669e96b3 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.IndexManagement; -public sealed partial class CloneResponse : ElasticsearchResponse +public sealed partial class SplitIndexResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetRequest.g.cs index 078fb0ce8a2..f25ce1b245e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetRequest.g.cs @@ -93,7 +93,7 @@ public MultiGetRequest(Elastic.Clients.Elasticsearch.IndexName? index) : base(r [JsonInclude] [JsonPropertyName("docs")] - public ICollection? Docs { get; set; } + public ICollection? Docs { get; set; } [JsonInclude] [JsonPropertyName("ids")] @@ -124,17 +124,17 @@ public MultiGetRequestDescriptor Index(Elastic.Clients.Elasticsearch. return Self; } - private ICollection? DocsValue { get; set; } + private ICollection? DocsValue { get; set; } - private Core.MGet.OperationDescriptor DocsDescriptor { get; set; } + private Core.MGet.MultiGetOperationDescriptor DocsDescriptor { get; set; } - private Action DocsDescriptorAction { get; set; } + private Action DocsDescriptorAction { get; set; } - private Action[] DocsDescriptorActions { get; set; } + private Action[] DocsDescriptorActions { get; set; } private Elastic.Clients.Elasticsearch.Ids? IdsValue { get; set; } - public MultiGetRequestDescriptor Docs(ICollection? docs) + public MultiGetRequestDescriptor Docs(ICollection? docs) { DocsDescriptor = null; DocsDescriptorAction = null; @@ -143,7 +143,7 @@ public MultiGetRequestDescriptor Docs(ICollection Docs(Core.MGet.OperationDescriptor descriptor) + public MultiGetRequestDescriptor Docs(Core.MGet.MultiGetOperationDescriptor descriptor) { DocsValue = null; DocsDescriptorAction = null; @@ -152,7 +152,7 @@ public MultiGetRequestDescriptor Docs(Core.MGet.OperationDescriptor d return Self; } - public MultiGetRequestDescriptor Docs(Action configure) + public MultiGetRequestDescriptor Docs(Action configure) { DocsValue = null; DocsDescriptor = null; @@ -161,7 +161,7 @@ public MultiGetRequestDescriptor Docs(Action Docs(params Action[] configure) + public MultiGetRequestDescriptor Docs(params Action[] configure) { DocsValue = null; DocsDescriptor = null; @@ -190,7 +190,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("docs"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new Core.MGet.OperationDescriptor(DocsDescriptorAction), options); + JsonSerializer.Serialize(writer, new Core.MGet.MultiGetOperationDescriptor(DocsDescriptorAction), options); writer.WriteEndArray(); } else if (DocsDescriptorActions is not null) @@ -199,7 +199,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in DocsDescriptorActions) { - JsonSerializer.Serialize(writer, new Core.MGet.OperationDescriptor(action), options); + JsonSerializer.Serialize(writer, new Core.MGet.MultiGetOperationDescriptor(action), options); } writer.WriteEndArray(); @@ -244,17 +244,17 @@ public MultiGetRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName? return Self; } - private ICollection? DocsValue { get; set; } + private ICollection? DocsValue { get; set; } - private Core.MGet.OperationDescriptor DocsDescriptor { get; set; } + private Core.MGet.MultiGetOperationDescriptor DocsDescriptor { get; set; } - private Action DocsDescriptorAction { get; set; } + private Action DocsDescriptorAction { get; set; } - private Action[] DocsDescriptorActions { get; set; } + private Action[] DocsDescriptorActions { get; set; } private Elastic.Clients.Elasticsearch.Ids? IdsValue { get; set; } - public MultiGetRequestDescriptor Docs(ICollection? docs) + public MultiGetRequestDescriptor Docs(ICollection? docs) { DocsDescriptor = null; DocsDescriptorAction = null; @@ -263,7 +263,7 @@ public MultiGetRequestDescriptor Docs(ICollection configure) + public MultiGetRequestDescriptor Docs(Action configure) { DocsValue = null; DocsDescriptor = null; @@ -281,7 +281,7 @@ public MultiGetRequestDescriptor Docs(Action conf return Self; } - public MultiGetRequestDescriptor Docs(params Action[] configure) + public MultiGetRequestDescriptor Docs(params Action[] configure) { DocsValue = null; DocsDescriptor = null; @@ -310,7 +310,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("docs"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new Core.MGet.OperationDescriptor(DocsDescriptorAction), options); + JsonSerializer.Serialize(writer, new Core.MGet.MultiGetOperationDescriptor(DocsDescriptorAction), options); writer.WriteEndArray(); } else if (DocsDescriptorActions is not null) @@ -319,7 +319,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in DocsDescriptorActions) { - JsonSerializer.Serialize(writer, new Core.MGet.OperationDescriptor(action), options); + JsonSerializer.Serialize(writer, new Core.MGet.MultiGetOperationDescriptor(action), options); } writer.WriteEndArray(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs index c3c88bcbc3c..0f71cc2c7d5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs @@ -27,5 +27,5 @@ public sealed partial class MultiGetResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("docs")] - public IReadOnlyCollection> Docs { get; init; } + public IReadOnlyCollection> Docs { get; init; } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs index 2fe99d0519d..4d573c009dd 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs @@ -27,7 +27,7 @@ public sealed partial class MultiSearchResponse : ElasticsearchRespon { [JsonInclude] [JsonPropertyName("responses")] - public IReadOnlyCollection> Responses { get; init; } + public IReadOnlyCollection> Responses { get; init; } [JsonInclude] [JsonPropertyName("took")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs index 137e44aeafd..6414e8d927b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs @@ -27,7 +27,7 @@ public sealed partial class MultiSearchTemplateResponse : Elasticsear { [JsonInclude] [JsonPropertyName("responses")] - public IReadOnlyCollection> Responses { get; init; } + public IReadOnlyCollection> Responses { get; init; } [JsonInclude] [JsonPropertyName("took")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs index d7dadc2cac9..0a5e76e2af4 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs @@ -197,7 +197,7 @@ public override SearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert if (property == "post_filter") { - variant.PostFilter = JsonSerializer.Deserialize(ref reader, options); + variant.PostFilter = JsonSerializer.Deserialize(ref reader, options); continue; } @@ -209,7 +209,7 @@ public override SearchRequest Read(ref Utf8JsonReader reader, Type typeToConvert if (property == "query") { - variant.Query = JsonSerializer.Deserialize(ref reader, options); + variant.Query = JsonSerializer.Deserialize(ref reader, options); continue; } @@ -672,7 +672,7 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => [JsonInclude] [JsonPropertyName("post_filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilter { get; set; } [JsonInclude] [JsonPropertyName("profile")] @@ -680,7 +680,7 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r => [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } [JsonInclude] [JsonPropertyName("rescore")] @@ -814,9 +814,9 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; } @@ -852,17 +852,17 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private Action> KnnDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor PostFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; } - private Action> PostFilterDescriptorAction { get; set; } + private Action> PostFilterDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private ICollection? RescoreValue { get; set; } @@ -944,7 +944,7 @@ public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticse return Self; } - public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -952,7 +952,7 @@ public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticse return Self; } - public SearchRequestDescriptor Aggregations(Action> configure) + public SearchRequestDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -1104,7 +1104,7 @@ public SearchRequestDescriptor Knn(Action PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter) + public SearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? postFilter) { PostFilterDescriptor = null; PostFilterDescriptorAction = null; @@ -1112,7 +1112,7 @@ public SearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsear return Self; } - public SearchRequestDescriptor PostFilter(QueryDsl.QueryContainerDescriptor descriptor) + public SearchRequestDescriptor PostFilter(QueryDsl.QueryDescriptor descriptor) { PostFilterValue = null; PostFilterDescriptorAction = null; @@ -1120,7 +1120,7 @@ public SearchRequestDescriptor PostFilter(QueryDsl.QueryContainerDesc return Self; } - public SearchRequestDescriptor PostFilter(Action> configure) + public SearchRequestDescriptor PostFilter(Action> configure) { PostFilterValue = null; PostFilterDescriptor = null; @@ -1128,7 +1128,7 @@ public SearchRequestDescriptor PostFilter(Action Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public SearchRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -1136,7 +1136,7 @@ public SearchRequestDescriptor Query(Elastic.Clients.Elasticsearch.Qu return Self; } - public SearchRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public SearchRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -1144,7 +1144,7 @@ public SearchRequestDescriptor Query(QueryDsl.QueryContainerDescripto return Self; } - public SearchRequestDescriptor Query(Action> configure) + public SearchRequestDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -1421,7 +1421,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -1547,7 +1547,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (PostFilterDescriptorAction is not null) { writer.WritePropertyName("post_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(PostFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(PostFilterDescriptorAction), options); } else if (PostFilterValue is not null) { @@ -1563,7 +1563,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -1848,9 +1848,9 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? in private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; } @@ -1886,17 +1886,17 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? in private Action KnnDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor PostFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; } - private Action PostFilterDescriptorAction { get; set; } + private Action PostFilterDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private ICollection? RescoreValue { get; set; } @@ -1978,7 +1978,7 @@ public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggreg return Self; } - public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -1986,7 +1986,7 @@ public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggreg return Self; } - public SearchRequestDescriptor Aggregations(Action configure) + public SearchRequestDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -2138,7 +2138,7 @@ public SearchRequestDescriptor Knn(Action configure) return Self; } - public SearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter) + public SearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? postFilter) { PostFilterDescriptor = null; PostFilterDescriptorAction = null; @@ -2146,7 +2146,7 @@ public SearchRequestDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl return Self; } - public SearchRequestDescriptor PostFilter(QueryDsl.QueryContainerDescriptor descriptor) + public SearchRequestDescriptor PostFilter(QueryDsl.QueryDescriptor descriptor) { PostFilterValue = null; PostFilterDescriptorAction = null; @@ -2154,7 +2154,7 @@ public SearchRequestDescriptor PostFilter(QueryDsl.QueryContainerDescriptor desc return Self; } - public SearchRequestDescriptor PostFilter(Action configure) + public SearchRequestDescriptor PostFilter(Action configure) { PostFilterValue = null; PostFilterDescriptor = null; @@ -2162,7 +2162,7 @@ public SearchRequestDescriptor PostFilter(Action configure) + public SearchRequestDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -2455,7 +2455,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -2581,7 +2581,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (PostFilterDescriptorAction is not null) { writer.WritePropertyName("post_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(PostFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(PostFilterDescriptorAction), options); } else if (PostFilterValue is not null) { @@ -2597,7 +2597,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlClearCursorRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorRequest.g.cs similarity index 81% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlClearCursorRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorRequest.g.cs index 67b00414534..560cbc45c1b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlClearCursorRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorRequest.g.cs @@ -27,11 +27,11 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed class SqlClearCursorRequestParameters : RequestParameters +public sealed class ClearCursorRequestParameters : RequestParameters { } -public sealed partial class SqlClearCursorRequest : PlainRequest +public sealed partial class ClearCursorRequest : PlainRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlClearCursor; internal override HttpMethod HttpMethod => HttpMethod.POST; @@ -41,10 +41,10 @@ public sealed partial class SqlClearCursorRequest : PlainRequest +public sealed partial class ClearCursorRequestDescriptor : RequestDescriptor { - internal SqlClearCursorRequestDescriptor(Action configure) => configure.Invoke(this); - public SqlClearCursorRequestDescriptor() + internal ClearCursorRequestDescriptor(Action configure) => configure.Invoke(this); + public ClearCursorRequestDescriptor() { } @@ -53,7 +53,7 @@ public SqlClearCursorRequestDescriptor() internal override bool SupportsBody => true; private string CursorValue { get; set; } - public SqlClearCursorRequestDescriptor Cursor(string cursor) + public ClearCursorRequestDescriptor Cursor(string cursor) { CursorValue = cursor; return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlClearCursorResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlClearCursorResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs index b2e045d7830..c7ef5d7772f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlClearCursorResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed partial class SqlClearCursorResponse : ElasticsearchResponse +public sealed partial class ClearCursorResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("succeeded")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlDeleteAsyncRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncRequest.g.cs similarity index 65% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlDeleteAsyncRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncRequest.g.cs index 9b74ad440c2..e1d3f330f61 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlDeleteAsyncRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncRequest.g.cs @@ -27,13 +27,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed class SqlDeleteAsyncRequestParameters : RequestParameters +public sealed class DeleteAsyncRequestParameters : RequestParameters { } -public sealed partial class SqlDeleteAsyncRequest : PlainRequest +public sealed partial class DeleteAsyncRequest : PlainRequest { - public SqlDeleteAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + public DeleteAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } @@ -42,21 +42,21 @@ public SqlDeleteAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r. internal override bool SupportsBody => false; } -public sealed partial class SqlDeleteAsyncRequestDescriptor : RequestDescriptor, SqlDeleteAsyncRequestParameters> +public sealed partial class DeleteAsyncRequestDescriptor : RequestDescriptor, DeleteAsyncRequestParameters> { - internal SqlDeleteAsyncRequestDescriptor(Action> configure) => configure.Invoke(this); - public SqlDeleteAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal DeleteAsyncRequestDescriptor(Action> configure) => configure.Invoke(this); + public DeleteAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal SqlDeleteAsyncRequestDescriptor() + internal DeleteAsyncRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlDeleteAsync; internal override HttpMethod HttpMethod => HttpMethod.DELETE; internal override bool SupportsBody => false; - public SqlDeleteAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public DeleteAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; @@ -67,21 +67,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class SqlDeleteAsyncRequestDescriptor : RequestDescriptor +public sealed partial class DeleteAsyncRequestDescriptor : RequestDescriptor { - internal SqlDeleteAsyncRequestDescriptor(Action configure) => configure.Invoke(this); - public SqlDeleteAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal DeleteAsyncRequestDescriptor(Action configure) => configure.Invoke(this); + public DeleteAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal SqlDeleteAsyncRequestDescriptor() + internal DeleteAsyncRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlDeleteAsync; internal override HttpMethod HttpMethod => HttpMethod.DELETE; internal override bool SupportsBody => false; - public SqlDeleteAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public DeleteAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlDeleteAsyncResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs similarity index 95% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlDeleteAsyncResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs index 00baece7e78..3b269a772de 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlDeleteAsyncResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed partial class SqlDeleteAsyncResponse : ElasticsearchResponse +public sealed partial class DeleteAsyncResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("acknowledged")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncRequest.g.cs similarity index 61% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncRequest.g.cs index ce4dcbc8063..0e7e8f186be 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncRequest.g.cs @@ -27,7 +27,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed class SqlGetAsyncRequestParameters : RequestParameters +public sealed class GetAsyncRequestParameters : RequestParameters { [JsonIgnore] public string? Delimiter { get => Q("delimiter"); set => Q("delimiter", value); } @@ -42,9 +42,9 @@ public sealed class SqlGetAsyncRequestParameters : RequestParameters public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); } } -public sealed partial class SqlGetAsyncRequest : PlainRequest +public sealed partial class GetAsyncRequest : PlainRequest { - public SqlGetAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + public GetAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } @@ -64,25 +64,25 @@ public SqlGetAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Req public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); } } -public sealed partial class SqlGetAsyncRequestDescriptor : RequestDescriptor, SqlGetAsyncRequestParameters> +public sealed partial class GetAsyncRequestDescriptor : RequestDescriptor, GetAsyncRequestParameters> { - internal SqlGetAsyncRequestDescriptor(Action> configure) => configure.Invoke(this); - public SqlGetAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal GetAsyncRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal SqlGetAsyncRequestDescriptor() + internal GetAsyncRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsync; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public SqlGetAsyncRequestDescriptor Delimiter(string? delimiter) => Qs("delimiter", delimiter); - public SqlGetAsyncRequestDescriptor Format(string? format) => Qs("format", format); - public SqlGetAsyncRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); - public SqlGetAsyncRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); - public SqlGetAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetAsyncRequestDescriptor Delimiter(string? delimiter) => Qs("delimiter", delimiter); + public GetAsyncRequestDescriptor Format(string? format) => Qs("format", format); + public GetAsyncRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); + public GetAsyncRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); + public GetAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; @@ -93,25 +93,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class SqlGetAsyncRequestDescriptor : RequestDescriptor +public sealed partial class GetAsyncRequestDescriptor : RequestDescriptor { - internal SqlGetAsyncRequestDescriptor(Action configure) => configure.Invoke(this); - public SqlGetAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal GetAsyncRequestDescriptor(Action configure) => configure.Invoke(this); + public GetAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal SqlGetAsyncRequestDescriptor() + internal GetAsyncRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsync; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public SqlGetAsyncRequestDescriptor Delimiter(string? delimiter) => Qs("delimiter", delimiter); - public SqlGetAsyncRequestDescriptor Format(string? format) => Qs("format", format); - public SqlGetAsyncRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); - public SqlGetAsyncRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); - public SqlGetAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetAsyncRequestDescriptor Delimiter(string? delimiter) => Qs("delimiter", delimiter); + public GetAsyncRequestDescriptor Format(string? format) => Qs("format", format); + public GetAsyncRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive); + public GetAsyncRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout); + public GetAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs index e3a635648b3..7bad603dda1 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed partial class SqlGetAsyncResponse : ElasticsearchResponse +public sealed partial class GetAsyncResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("columns")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncStatusRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusRequest.g.cs similarity index 64% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncStatusRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusRequest.g.cs index de64cd0020f..c19d2144bf6 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncStatusRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusRequest.g.cs @@ -27,13 +27,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed class SqlGetAsyncStatusRequestParameters : RequestParameters +public sealed class GetAsyncStatusRequestParameters : RequestParameters { } -public sealed partial class SqlGetAsyncStatusRequest : PlainRequest +public sealed partial class GetAsyncStatusRequest : PlainRequest { - public SqlGetAsyncStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + public GetAsyncStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } @@ -42,21 +42,21 @@ public SqlGetAsyncStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => internal override bool SupportsBody => false; } -public sealed partial class SqlGetAsyncStatusRequestDescriptor : RequestDescriptor, SqlGetAsyncStatusRequestParameters> +public sealed partial class GetAsyncStatusRequestDescriptor : RequestDescriptor, GetAsyncStatusRequestParameters> { - internal SqlGetAsyncStatusRequestDescriptor(Action> configure) => configure.Invoke(this); - public SqlGetAsyncStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal GetAsyncStatusRequestDescriptor(Action> configure) => configure.Invoke(this); + public GetAsyncStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal SqlGetAsyncStatusRequestDescriptor() + internal GetAsyncStatusRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsyncStatus; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public SqlGetAsyncStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetAsyncStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; @@ -67,21 +67,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class SqlGetAsyncStatusRequestDescriptor : RequestDescriptor +public sealed partial class GetAsyncStatusRequestDescriptor : RequestDescriptor { - internal SqlGetAsyncStatusRequestDescriptor(Action configure) => configure.Invoke(this); - public SqlGetAsyncStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) + internal GetAsyncStatusRequestDescriptor(Action configure) => configure.Invoke(this); + public GetAsyncStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id)) { } - internal SqlGetAsyncStatusRequestDescriptor() + internal GetAsyncStatusRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsyncStatus; internal override HttpMethod HttpMethod => HttpMethod.GET; internal override bool SupportsBody => false; - public SqlGetAsyncStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public GetAsyncStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { RouteValues.Required("id", id); return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncStatusResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs index 5a6f08c3c96..a152dbf9816 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncStatusResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed partial class SqlGetAsyncStatusResponse : ElasticsearchResponse +public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("completion_status")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryRequest.g.cs similarity index 72% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryRequest.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryRequest.g.cs index 4ab1f57358d..87cc37a23fc 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryRequest.g.cs @@ -27,11 +27,11 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed class SqlQueryRequestParameters : RequestParameters +public sealed class QueryRequestParameters : RequestParameters { } -public sealed partial class SqlQueryRequest : PlainRequest +public sealed partial class QueryRequest : PlainRequest { internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlQuery; internal override HttpMethod HttpMethod => HttpMethod.POST; @@ -54,7 +54,7 @@ public sealed partial class SqlQueryRequest : PlainRequest : RequestDescriptor, SqlQueryRequestParameters> +public sealed partial class QueryRequestDescriptor : RequestDescriptor, QueryRequestParameters> { - internal SqlQueryRequestDescriptor(Action> configure) => configure.Invoke(this); - public SqlQueryRequestDescriptor() + internal QueryRequestDescriptor(Action> configure) => configure.Invoke(this); + public QueryRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlQuery; internal override HttpMethod HttpMethod => HttpMethod.POST; internal override bool SupportsBody => true; - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } private string? CatalogValue { get; set; } @@ -147,7 +147,7 @@ public SqlQueryRequestDescriptor() private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; } - public SqlQueryRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public QueryRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -155,7 +155,7 @@ public SqlQueryRequestDescriptor Filter(Elastic.Clients.Elasticsearch return Self; } - public SqlQueryRequestDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public QueryRequestDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -163,7 +163,7 @@ public SqlQueryRequestDescriptor Filter(QueryDsl.QueryContainerDescri return Self; } - public SqlQueryRequestDescriptor Filter(Action> configure) + public QueryRequestDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -171,91 +171,91 @@ public SqlQueryRequestDescriptor Filter(Action Catalog(string? catalog) + public QueryRequestDescriptor Catalog(string? catalog) { CatalogValue = catalog; return Self; } - public SqlQueryRequestDescriptor Columnar(bool? columnar = true) + public QueryRequestDescriptor Columnar(bool? columnar = true) { ColumnarValue = columnar; return Self; } - public SqlQueryRequestDescriptor Cursor(string? cursor) + public QueryRequestDescriptor Cursor(string? cursor) { CursorValue = cursor; return Self; } - public SqlQueryRequestDescriptor FetchSize(int? fetchSize) + public QueryRequestDescriptor FetchSize(int? fetchSize) { FetchSizeValue = fetchSize; return Self; } - public SqlQueryRequestDescriptor FieldMultiValueLeniency(bool? fieldMultiValueLeniency = true) + public QueryRequestDescriptor FieldMultiValueLeniency(bool? fieldMultiValueLeniency = true) { FieldMultiValueLeniencyValue = fieldMultiValueLeniency; return Self; } - public SqlQueryRequestDescriptor IndexUsingFrozen(bool? indexUsingFrozen = true) + public QueryRequestDescriptor IndexUsingFrozen(bool? indexUsingFrozen = true) { IndexUsingFrozenValue = indexUsingFrozen; return Self; } - public SqlQueryRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) + public QueryRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) { KeepAliveValue = keepAlive; return Self; } - public SqlQueryRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true) + public QueryRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true) { KeepOnCompletionValue = keepOnCompletion; return Self; } - public SqlQueryRequestDescriptor PageTimeout(Elastic.Clients.Elasticsearch.Duration? pageTimeout) + public QueryRequestDescriptor PageTimeout(Elastic.Clients.Elasticsearch.Duration? pageTimeout) { PageTimeoutValue = pageTimeout; return Self; } - public SqlQueryRequestDescriptor Params(Func, FluentDictionary> selector) + public QueryRequestDescriptor Params(Func, FluentDictionary> selector) { ParamsValue = selector?.Invoke(new FluentDictionary()); return Self; } - public SqlQueryRequestDescriptor Query(string? query) + public QueryRequestDescriptor Query(string? query) { QueryValue = query; return Self; } - public SqlQueryRequestDescriptor RequestTimeout(Elastic.Clients.Elasticsearch.Duration? requestTimeout) + public QueryRequestDescriptor RequestTimeout(Elastic.Clients.Elasticsearch.Duration? requestTimeout) { RequestTimeoutValue = requestTimeout; return Self; } - public SqlQueryRequestDescriptor RuntimeMappings(Func, FluentDictionary> selector) + public QueryRequestDescriptor RuntimeMappings(Func, FluentDictionary> selector) { RuntimeMappingsValue = selector?.Invoke(new FluentDictionary()); return Self; } - public SqlQueryRequestDescriptor TimeZone(string? timeZone) + public QueryRequestDescriptor TimeZone(string? timeZone) { TimeZoneValue = timeZone; return Self; } - public SqlQueryRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) + public QueryRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) { WaitForCompletionTimeoutValue = waitForCompletionTimeout; return Self; @@ -272,7 +272,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { @@ -374,21 +374,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class SqlQueryRequestDescriptor : RequestDescriptor +public sealed partial class QueryRequestDescriptor : RequestDescriptor { - internal SqlQueryRequestDescriptor(Action configure) => configure.Invoke(this); - public SqlQueryRequestDescriptor() + internal QueryRequestDescriptor(Action configure) => configure.Invoke(this); + public QueryRequestDescriptor() { } internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlQuery; internal override HttpMethod HttpMethod => HttpMethod.POST; internal override bool SupportsBody => true; - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } private string? CatalogValue { get; set; } @@ -420,7 +420,7 @@ public SqlQueryRequestDescriptor() private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; } - public SqlQueryRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public QueryRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -428,7 +428,7 @@ public SqlQueryRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Q return Self; } - public SqlQueryRequestDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public QueryRequestDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -436,7 +436,7 @@ public SqlQueryRequestDescriptor Filter(QueryDsl.QueryContainerDescriptor descri return Self; } - public SqlQueryRequestDescriptor Filter(Action configure) + public QueryRequestDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -444,91 +444,91 @@ public SqlQueryRequestDescriptor Filter(Action, FluentDictionary> selector) + public QueryRequestDescriptor Params(Func, FluentDictionary> selector) { ParamsValue = selector?.Invoke(new FluentDictionary()); return Self; } - public SqlQueryRequestDescriptor Query(string? query) + public QueryRequestDescriptor Query(string? query) { QueryValue = query; return Self; } - public SqlQueryRequestDescriptor RequestTimeout(Elastic.Clients.Elasticsearch.Duration? requestTimeout) + public QueryRequestDescriptor RequestTimeout(Elastic.Clients.Elasticsearch.Duration? requestTimeout) { RequestTimeoutValue = requestTimeout; return Self; } - public SqlQueryRequestDescriptor RuntimeMappings(Func, FluentDictionary> selector) + public QueryRequestDescriptor RuntimeMappings(Func, FluentDictionary> selector) { RuntimeMappingsValue = selector?.Invoke(new FluentDictionary()); return Self; } - public SqlQueryRequestDescriptor TimeZone(string? timeZone) + public QueryRequestDescriptor TimeZone(string? timeZone) { TimeZoneValue = timeZone; return Self; } - public SqlQueryRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) + public QueryRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) { WaitForCompletionTimeoutValue = waitForCompletionTimeout; return Self; @@ -545,7 +545,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs similarity index 96% rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryResponse.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs index 28c0741d01f..768faf19e57 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs @@ -23,7 +23,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Sql; -public sealed partial class SqlQueryResponse : ElasticsearchResponse +public sealed partial class QueryResponse : ElasticsearchResponse { [JsonInclude] [JsonPropertyName("columns")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs index 894109a8bb4..e52f3827f97 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs @@ -58,7 +58,7 @@ public TermsEnumRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r [JsonInclude] [JsonPropertyName("index_filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? IndexFilter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilter { get; set; } [JsonInclude] [JsonPropertyName("string")] @@ -93,11 +93,11 @@ public TermsEnumRequestDescriptor Index(Elastic.Clients.Elasticsearch return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? IndexFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor IndexFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor IndexFilterDescriptor { get; set; } - private Action> IndexFilterDescriptorAction { get; set; } + private Action> IndexFilterDescriptorAction { get; set; } private bool? CaseInsensitiveValue { get; set; } @@ -111,7 +111,7 @@ public TermsEnumRequestDescriptor Index(Elastic.Clients.Elasticsearch private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; } - public TermsEnumRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? indexFilter) + public TermsEnumRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? indexFilter) { IndexFilterDescriptor = null; IndexFilterDescriptorAction = null; @@ -119,7 +119,7 @@ public TermsEnumRequestDescriptor IndexFilter(Elastic.Clients.Elastic return Self; } - public TermsEnumRequestDescriptor IndexFilter(QueryDsl.QueryContainerDescriptor descriptor) + public TermsEnumRequestDescriptor IndexFilter(QueryDsl.QueryDescriptor descriptor) { IndexFilterValue = null; IndexFilterDescriptorAction = null; @@ -127,7 +127,7 @@ public TermsEnumRequestDescriptor IndexFilter(QueryDsl.QueryContainer return Self; } - public TermsEnumRequestDescriptor IndexFilter(Action> configure) + public TermsEnumRequestDescriptor IndexFilter(Action> configure) { IndexFilterValue = null; IndexFilterDescriptor = null; @@ -188,7 +188,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (IndexFilterDescriptorAction is not null) { writer.WritePropertyName("index_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(IndexFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(IndexFilterDescriptorAction), options); } else if (IndexFilterValue is not null) { @@ -252,11 +252,11 @@ public TermsEnumRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? IndexFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor IndexFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor IndexFilterDescriptor { get; set; } - private Action IndexFilterDescriptorAction { get; set; } + private Action IndexFilterDescriptorAction { get; set; } private bool? CaseInsensitiveValue { get; set; } @@ -270,7 +270,7 @@ public TermsEnumRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; } - public TermsEnumRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? indexFilter) + public TermsEnumRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? indexFilter) { IndexFilterDescriptor = null; IndexFilterDescriptorAction = null; @@ -278,7 +278,7 @@ public TermsEnumRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.Quer return Self; } - public TermsEnumRequestDescriptor IndexFilter(QueryDsl.QueryContainerDescriptor descriptor) + public TermsEnumRequestDescriptor IndexFilter(QueryDsl.QueryDescriptor descriptor) { IndexFilterValue = null; IndexFilterDescriptorAction = null; @@ -286,7 +286,7 @@ public TermsEnumRequestDescriptor IndexFilter(QueryDsl.QueryContainerDescriptor return Self; } - public TermsEnumRequestDescriptor IndexFilter(Action configure) + public TermsEnumRequestDescriptor IndexFilter(Action configure) { IndexFilterValue = null; IndexFilterDescriptor = null; @@ -353,7 +353,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (IndexFilterDescriptorAction is not null) { writer.WritePropertyName("index_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(IndexFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(IndexFilterDescriptorAction), options); } else if (IndexFilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs index 13dbf9be154..1fe102dbc66 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs @@ -213,7 +213,7 @@ public UpdateByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } [JsonInclude] [JsonPropertyName("script")] @@ -276,11 +276,11 @@ public UpdateByQueryRequestDescriptor Indices(Elastic.Clients.Elastic return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; } @@ -294,7 +294,7 @@ public UpdateByQueryRequestDescriptor Indices(Elastic.Clients.Elastic private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; } - public UpdateByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public UpdateByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -302,7 +302,7 @@ public UpdateByQueryRequestDescriptor Query(Elastic.Clients.Elasticse return Self; } - public UpdateByQueryRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public UpdateByQueryRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -310,7 +310,7 @@ public UpdateByQueryRequestDescriptor Query(QueryDsl.QueryContainerDe return Self; } - public UpdateByQueryRequestDescriptor Query(Action> configure) + public UpdateByQueryRequestDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -371,7 +371,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -465,11 +465,11 @@ public UpdateByQueryRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indi return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; } @@ -483,7 +483,7 @@ public UpdateByQueryRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indi private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; } - public UpdateByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public UpdateByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -491,7 +491,7 @@ public UpdateByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryD return Self; } - public UpdateByQueryRequestDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public UpdateByQueryRequestDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -499,7 +499,7 @@ public UpdateByQueryRequestDescriptor Query(QueryDsl.QueryContainerDescriptor de return Self; } - public UpdateByQueryRequestDescriptor Query(Action configure) + public UpdateByQueryRequestDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -560,7 +560,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs index 294a3a09e89..d91efc515ca 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs @@ -92,48 +92,6 @@ public virtual Task StatusAsync(Elastic.Cl return DoRequestAsync, AsyncSearchStatusResponse, AsyncSearchStatusRequestParameters>(descriptor); } - public virtual AsyncSearchSubmitResponse Submit(AsyncSearchSubmitRequest request) - { - request.BeforeRequest(); - return DoRequest, AsyncSearchSubmitRequestParameters>(request); - } - - public virtual Task> SubmitAsync(AsyncSearchSubmitRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync, AsyncSearchSubmitRequestParameters>(request, cancellationToken); - } - - public virtual AsyncSearchSubmitResponse Submit() - { - var descriptor = new AsyncSearchSubmitRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequest, AsyncSearchSubmitResponse, AsyncSearchSubmitRequestParameters>(descriptor); - } - - public virtual AsyncSearchSubmitResponse Submit(Action> configureRequest) - { - var descriptor = new AsyncSearchSubmitRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, AsyncSearchSubmitResponse, AsyncSearchSubmitRequestParameters>(descriptor); - } - - public virtual Task> SubmitAsync(CancellationToken cancellationToken = default) - { - var descriptor = new AsyncSearchSubmitRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequestAsync, AsyncSearchSubmitResponse, AsyncSearchSubmitRequestParameters>(descriptor); - } - - public virtual Task> SubmitAsync(Action> configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new AsyncSearchSubmitRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync, AsyncSearchSubmitResponse, AsyncSearchSubmitRequestParameters>(descriptor); - } - public virtual DeleteAsyncSearchResponse Delete(DeleteAsyncSearchRequest request) { request.BeforeRequest(); @@ -233,4 +191,46 @@ public virtual Task> GetAsync(Elast descriptor.BeforeRequest(); return DoRequestAsync, GetAsyncSearchResponse, GetAsyncSearchRequestParameters>(descriptor); } + + public virtual SubmitAsyncSearchResponse Submit(SubmitAsyncSearchRequest request) + { + request.BeforeRequest(); + return DoRequest, SubmitAsyncSearchRequestParameters>(request); + } + + public virtual Task> SubmitAsync(SubmitAsyncSearchRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync, SubmitAsyncSearchRequestParameters>(request, cancellationToken); + } + + public virtual SubmitAsyncSearchResponse Submit() + { + var descriptor = new SubmitAsyncSearchRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequest, SubmitAsyncSearchResponse, SubmitAsyncSearchRequestParameters>(descriptor); + } + + public virtual SubmitAsyncSearchResponse Submit(Action> configureRequest) + { + var descriptor = new SubmitAsyncSearchRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest, SubmitAsyncSearchResponse, SubmitAsyncSearchRequestParameters>(descriptor); + } + + public virtual Task> SubmitAsync(CancellationToken cancellationToken = default) + { + var descriptor = new SubmitAsyncSearchRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequestAsync, SubmitAsyncSearchResponse, SubmitAsyncSearchRequestParameters>(descriptor); + } + + public virtual Task> SubmitAsync(Action> configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new SubmitAsyncSearchRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync, SubmitAsyncSearchResponse, SubmitAsyncSearchRequestParameters>(descriptor); + } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs index 3bd8a4dacf8..5e75fc8fcc1 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs @@ -34,61 +34,61 @@ internal ClusterNamespacedClient(ElasticsearchClient client) : base(client) { } - public virtual ClusterHealthResponse Health(ClusterHealthRequest request) + public virtual HealthResponse Health(HealthRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task HealthAsync(ClusterHealthRequest request, CancellationToken cancellationToken = default) + public virtual Task HealthAsync(HealthRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual ClusterHealthResponse Health() + public virtual HealthResponse Health() { - var descriptor = new ClusterHealthRequestDescriptor(); + var descriptor = new HealthRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual ClusterHealthResponse Health(Action configureRequest) + public virtual HealthResponse Health(Action configureRequest) { - var descriptor = new ClusterHealthRequestDescriptor(); + var descriptor = new HealthRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual ClusterHealthResponse Health(Action> configureRequest) + public virtual HealthResponse Health(Action> configureRequest) { - var descriptor = new ClusterHealthRequestDescriptor(); + var descriptor = new HealthRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, ClusterHealthResponse, ClusterHealthRequestParameters>(descriptor); + return DoRequest, HealthResponse, HealthRequestParameters>(descriptor); } - public virtual Task HealthAsync(CancellationToken cancellationToken = default) + public virtual Task HealthAsync(CancellationToken cancellationToken = default) { - var descriptor = new ClusterHealthRequestDescriptor(); + var descriptor = new HealthRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task HealthAsync(Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task HealthAsync(Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new ClusterHealthRequestDescriptor(); + var descriptor = new HealthRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task HealthAsync(Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task HealthAsync(Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new ClusterHealthRequestDescriptor(); + var descriptor = new HealthRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, ClusterHealthResponse, ClusterHealthRequestParameters>(descriptor); + return DoRequestAsync, HealthResponse, HealthRequestParameters>(descriptor); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Eql.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Eql.g.cs index c4c285882ee..5d49eba6e3d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Eql.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Eql.g.cs @@ -34,120 +34,104 @@ internal EqlNamespacedClient(ElasticsearchClient client) : base(client) { } - public virtual DeleteEqlResponse Delete(DeleteEqlRequest request) + public virtual EqlDeleteResponse Delete(EqlDeleteRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task DeleteAsync(DeleteEqlRequest request, CancellationToken cancellationToken = default) + public virtual Task DeleteAsync(EqlDeleteRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual DeleteEqlResponse Delete(Elastic.Clients.Elasticsearch.Id id) + public virtual EqlDeleteResponse Delete(Elastic.Clients.Elasticsearch.Id id) { - var descriptor = new DeleteEqlRequestDescriptor(id); + var descriptor = new EqlDeleteRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual DeleteEqlResponse Delete(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) + public virtual EqlDeleteResponse Delete(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) { - var descriptor = new DeleteEqlRequestDescriptor(id); + var descriptor = new EqlDeleteRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual DeleteEqlResponse Delete(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) + public virtual EqlDeleteResponse Delete(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) { - var descriptor = new DeleteEqlRequestDescriptor(id); + var descriptor = new EqlDeleteRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, DeleteEqlResponse, DeleteEqlRequestParameters>(descriptor); + return DoRequest, EqlDeleteResponse, EqlDeleteRequestParameters>(descriptor); } - public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) { - var descriptor = new DeleteEqlRequestDescriptor(id); + var descriptor = new EqlDeleteRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new DeleteEqlRequestDescriptor(id); + var descriptor = new EqlDeleteRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new DeleteEqlRequestDescriptor(id); + var descriptor = new EqlDeleteRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, DeleteEqlResponse, DeleteEqlRequestParameters>(descriptor); + return DoRequestAsync, EqlDeleteResponse, EqlDeleteRequestParameters>(descriptor); } - public virtual EqlGetStatusResponse GetStatus(EqlGetStatusRequest request) + public virtual EqlGetResponse Get(EqlGetRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest, EqlGetRequestParameters>(request); } - public virtual Task GetStatusAsync(EqlGetStatusRequest request, CancellationToken cancellationToken = default) + public virtual Task> GetAsync(EqlGetRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync, EqlGetRequestParameters>(request, cancellationToken); } - public virtual EqlGetStatusResponse GetStatus(Elastic.Clients.Elasticsearch.Id id) + public virtual EqlGetResponse Get(Elastic.Clients.Elasticsearch.Id id) { - var descriptor = new EqlGetStatusRequestDescriptor(id); + var descriptor = new EqlGetRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest, EqlGetRequestParameters>(descriptor); } - public virtual EqlGetStatusResponse GetStatus(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) + public virtual EqlGetResponse Get(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) { - var descriptor = new EqlGetStatusRequestDescriptor(id); + var descriptor = new EqlGetRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest, EqlGetRequestParameters>(descriptor); } - public virtual EqlGetStatusResponse GetStatus(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) + public virtual Task> GetAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) { - var descriptor = new EqlGetStatusRequestDescriptor(id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, EqlGetStatusResponse, EqlGetStatusRequestParameters>(descriptor); - } - - public virtual Task GetStatusAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) - { - var descriptor = new EqlGetStatusRequestDescriptor(id); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetStatusAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new EqlGetStatusRequestDescriptor(id); - configureRequest?.Invoke(descriptor); + var descriptor = new EqlGetRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync, EqlGetRequestParameters>(descriptor); } - public virtual Task GetStatusAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task> GetAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new EqlGetStatusRequestDescriptor(id); + var descriptor = new EqlGetRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, EqlGetStatusResponse, EqlGetStatusRequestParameters>(descriptor); + return DoRequestAsync, EqlGetRequestParameters>(descriptor); } public virtual EqlSearchResponse Search(EqlSearchRequest request) @@ -192,45 +176,61 @@ public virtual Task> SearchAsync(Elastic.Clien return DoRequestAsync, EqlSearchRequestParameters>(descriptor); } - public virtual GetEqlResponse Get(GetEqlRequest request) + public virtual GetEqlStatusResponse GetStatus(GetEqlStatusRequest request) { request.BeforeRequest(); - return DoRequest, GetEqlRequestParameters>(request); + return DoRequest(request); } - public virtual Task> GetAsync(GetEqlRequest request, CancellationToken cancellationToken = default) + public virtual Task GetStatusAsync(GetEqlStatusRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync, GetEqlRequestParameters>(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual GetEqlResponse Get(Elastic.Clients.Elasticsearch.Id id) + public virtual GetEqlStatusResponse GetStatus(Elastic.Clients.Elasticsearch.Id id) { - var descriptor = new GetEqlRequestDescriptor(id); + var descriptor = new GetEqlStatusRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequest, GetEqlRequestParameters>(descriptor); + return DoRequest(descriptor); } - public virtual GetEqlResponse Get(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) + public virtual GetEqlStatusResponse GetStatus(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) { - var descriptor = new GetEqlRequestDescriptor(id); + var descriptor = new GetEqlStatusRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, GetEqlRequestParameters>(descriptor); + return DoRequest(descriptor); } - public virtual Task> GetAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + public virtual GetEqlStatusResponse GetStatus(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) { - var descriptor = new GetEqlRequestDescriptor(id); + var descriptor = new GetEqlStatusRequestDescriptor(id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest, GetEqlStatusResponse, GetEqlStatusRequestParameters>(descriptor); + } + + public virtual Task GetStatusAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + { + var descriptor = new GetEqlStatusRequestDescriptor(id); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetStatusAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetEqlStatusRequestDescriptor(id); + configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, GetEqlRequestParameters>(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task> GetAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task GetStatusAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new GetEqlRequestDescriptor(id); + var descriptor = new GetEqlStatusRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, GetEqlRequestParameters>(descriptor); + return DoRequestAsync, GetEqlStatusResponse, GetEqlStatusRequestParameters>(descriptor); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs index d9259009faa..92380563127 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs @@ -34,208 +34,150 @@ internal IndicesNamespacedClient(ElasticsearchClient client) : base(client) { } - public virtual AliasResponse GetAlias(AliasRequest request) + public virtual CloneIndexResponse Clone(CloneIndexRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task GetAliasAsync(AliasRequest request, CancellationToken cancellationToken = default) + public virtual Task CloneAsync(CloneIndexRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual AliasResponse GetAlias() + public virtual CloneIndexResponse Clone(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) { - var descriptor = new AliasRequestDescriptor(); + var descriptor = new CloneIndexRequestDescriptor(index, target); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual AliasResponse GetAlias(Action configureRequest) + public virtual CloneIndexResponse Clone(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, Action configureRequest) { - var descriptor = new AliasRequestDescriptor(); + var descriptor = new CloneIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual AliasResponse GetAlias(Action> configureRequest) + public virtual CloneIndexResponse Clone(Elastic.Clients.Elasticsearch.Name target) { - var descriptor = new AliasRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, AliasResponse, AliasRequestParameters>(descriptor); - } - - public virtual Task GetAliasAsync(CancellationToken cancellationToken = default) - { - var descriptor = new AliasRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetAliasAsync(Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new AliasRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetAliasAsync(Action> configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new AliasRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync, AliasResponse, AliasRequestParameters>(descriptor); - } - - public virtual CloneResponse Clone(CloneRequest request) - { - request.BeforeRequest(); - return DoRequest(request); - } - - public virtual Task CloneAsync(CloneRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); - } - - public virtual CloneResponse Clone(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) - { - var descriptor = new CloneRequestDescriptor(index, target); + var descriptor = new CloneIndexRequestDescriptor(typeof(TDocument), target); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest, CloneIndexResponse, CloneIndexRequestParameters>(descriptor); } - public virtual CloneResponse Clone(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, Action configureRequest) + public virtual CloneIndexResponse Clone(Elastic.Clients.Elasticsearch.Name target, Action> configureRequest) { - var descriptor = new CloneRequestDescriptor(index, target); + var descriptor = new CloneIndexRequestDescriptor(typeof(TDocument), target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual CloneResponse Clone(Elastic.Clients.Elasticsearch.Name target) - { - var descriptor = new CloneRequestDescriptor(typeof(TDocument), target); - descriptor.BeforeRequest(); - return DoRequest, CloneResponse, CloneRequestParameters>(descriptor); + return DoRequest, CloneIndexResponse, CloneIndexRequestParameters>(descriptor); } - public virtual CloneResponse Clone(Elastic.Clients.Elasticsearch.Name target, Action> configureRequest) + public virtual CloneIndexResponse Clone(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, Action> configureRequest) { - var descriptor = new CloneRequestDescriptor(typeof(TDocument), target); + var descriptor = new CloneIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, CloneResponse, CloneRequestParameters>(descriptor); + return DoRequest, CloneIndexResponse, CloneIndexRequestParameters>(descriptor); } - public virtual CloneResponse Clone(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, Action> configureRequest) + public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, CancellationToken cancellationToken = default) { - var descriptor = new CloneRequestDescriptor(index, target); - configureRequest?.Invoke(descriptor); + var descriptor = new CloneIndexRequestDescriptor(index, target); descriptor.BeforeRequest(); - return DoRequest, CloneResponse, CloneRequestParameters>(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, CancellationToken cancellationToken = default) + public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new CloneRequestDescriptor(index, target); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new CloneRequestDescriptor(index, target); + var descriptor = new CloneIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.Name target, CancellationToken cancellationToken = default) + public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.Name target, CancellationToken cancellationToken = default) { - var descriptor = new CloneRequestDescriptor(typeof(TDocument), target); + var descriptor = new CloneIndexRequestDescriptor(typeof(TDocument), target); descriptor.BeforeRequest(); - return DoRequestAsync, CloneResponse, CloneRequestParameters>(descriptor); + return DoRequestAsync, CloneIndexResponse, CloneIndexRequestParameters>(descriptor); } - public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.Name target, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.Name target, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new CloneRequestDescriptor(typeof(TDocument), target); + var descriptor = new CloneIndexRequestDescriptor(typeof(TDocument), target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, CloneResponse, CloneRequestParameters>(descriptor); + return DoRequestAsync, CloneIndexResponse, CloneIndexRequestParameters>(descriptor); } - public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task CloneAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new CloneRequestDescriptor(index, target); + var descriptor = new CloneIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, CloneResponse, CloneRequestParameters>(descriptor); + return DoRequestAsync, CloneIndexResponse, CloneIndexRequestParameters>(descriptor); } - public virtual CloseResponse Close(CloseRequest request) + public virtual CloseIndexResponse Close(CloseIndexRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task CloseAsync(CloseRequest request, CancellationToken cancellationToken = default) + public virtual Task CloseAsync(CloseIndexRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual CloseResponse Close(Elastic.Clients.Elasticsearch.Indices indices) + public virtual CloseIndexResponse Close(Elastic.Clients.Elasticsearch.Indices indices) { - var descriptor = new CloseRequestDescriptor(indices); + var descriptor = new CloseIndexRequestDescriptor(indices); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual CloseResponse Close(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest) + public virtual CloseIndexResponse Close(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest) { - var descriptor = new CloseRequestDescriptor(indices); + var descriptor = new CloseIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual CloseResponse Close(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest) + public virtual CloseIndexResponse Close(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest) { - var descriptor = new CloseRequestDescriptor(indices); + var descriptor = new CloseIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, CloseResponse, CloseRequestParameters>(descriptor); + return DoRequest, CloseIndexResponse, CloseIndexRequestParameters>(descriptor); } - public virtual Task CloseAsync(Elastic.Clients.Elasticsearch.Indices indices, CancellationToken cancellationToken = default) + public virtual Task CloseAsync(Elastic.Clients.Elasticsearch.Indices indices, CancellationToken cancellationToken = default) { - var descriptor = new CloseRequestDescriptor(indices); + var descriptor = new CloseIndexRequestDescriptor(indices); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task CloseAsync(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task CloseAsync(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new CloseRequestDescriptor(indices); + var descriptor = new CloseIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task CloseAsync(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task CloseAsync(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new CloseRequestDescriptor(indices); + var descriptor = new CloseIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, CloseResponse, CloseRequestParameters>(descriptor); + return DoRequestAsync, CloseIndexResponse, CloseIndexRequestParameters>(descriptor); } public virtual CreateDataStreamResponse CreateDataStream(CreateDataStreamRequest request) @@ -280,134 +222,92 @@ public virtual Task CreateDataStreamAsync(Elastic.Clie return DoRequestAsync(descriptor); } - public virtual CreateResponse Create(CreateRequest request) + public virtual CreateIndexResponse Create(CreateIndexRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task CreateAsync(CreateRequest request, CancellationToken cancellationToken = default) + public virtual Task CreateAsync(CreateIndexRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual CreateResponse Create(Elastic.Clients.Elasticsearch.IndexName index) + public virtual CreateIndexResponse Create(Elastic.Clients.Elasticsearch.IndexName index) { - var descriptor = new CreateRequestDescriptor(index); + var descriptor = new CreateIndexRequestDescriptor(index); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual CreateResponse Create(Elastic.Clients.Elasticsearch.IndexName index, Action configureRequest) + public virtual CreateIndexResponse Create(Elastic.Clients.Elasticsearch.IndexName index, Action configureRequest) { - var descriptor = new CreateRequestDescriptor(index); + var descriptor = new CreateIndexRequestDescriptor(index); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual CreateResponse Create() + public virtual CreateIndexResponse Create() { - var descriptor = new CreateRequestDescriptor(typeof(TDocument)); + var descriptor = new CreateIndexRequestDescriptor(typeof(TDocument)); descriptor.BeforeRequest(); - return DoRequest, CreateResponse, CreateRequestParameters>(descriptor); + return DoRequest, CreateIndexResponse, CreateIndexRequestParameters>(descriptor); } - public virtual CreateResponse Create(Action> configureRequest) + public virtual CreateIndexResponse Create(Action> configureRequest) { - var descriptor = new CreateRequestDescriptor(typeof(TDocument)); + var descriptor = new CreateIndexRequestDescriptor(typeof(TDocument)); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, CreateResponse, CreateRequestParameters>(descriptor); + return DoRequest, CreateIndexResponse, CreateIndexRequestParameters>(descriptor); } - public virtual CreateResponse Create(Elastic.Clients.Elasticsearch.IndexName index, Action> configureRequest) + public virtual CreateIndexResponse Create(Elastic.Clients.Elasticsearch.IndexName index, Action> configureRequest) { - var descriptor = new CreateRequestDescriptor(index); + var descriptor = new CreateIndexRequestDescriptor(index); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, CreateResponse, CreateRequestParameters>(descriptor); - } - - public virtual Task CreateAsync(Elastic.Clients.Elasticsearch.IndexName index, CancellationToken cancellationToken = default) - { - var descriptor = new CreateRequestDescriptor(index); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task CreateAsync(Elastic.Clients.Elasticsearch.IndexName index, Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new CreateRequestDescriptor(index); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task CreateAsync(CancellationToken cancellationToken = default) - { - var descriptor = new CreateRequestDescriptor(typeof(TDocument)); - descriptor.BeforeRequest(); - return DoRequestAsync, CreateResponse, CreateRequestParameters>(descriptor); + return DoRequest, CreateIndexResponse, CreateIndexRequestParameters>(descriptor); } - public virtual Task CreateAsync(Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task CreateAsync(Elastic.Clients.Elasticsearch.IndexName index, CancellationToken cancellationToken = default) { - var descriptor = new CreateRequestDescriptor(typeof(TDocument)); - configureRequest?.Invoke(descriptor); + var descriptor = new CreateIndexRequestDescriptor(index); descriptor.BeforeRequest(); - return DoRequestAsync, CreateResponse, CreateRequestParameters>(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task CreateAsync(Elastic.Clients.Elasticsearch.IndexName index, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task CreateAsync(Elastic.Clients.Elasticsearch.IndexName index, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new CreateRequestDescriptor(index); + var descriptor = new CreateIndexRequestDescriptor(index); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, CreateResponse, CreateRequestParameters>(descriptor); - } - - public virtual DataStreamResponse GetDataStream(DataStreamRequest request) - { - request.BeforeRequest(); - return DoRequest(request); - } - - public virtual Task GetDataStreamAsync(DataStreamRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(descriptor); } - public virtual DataStreamResponse GetDataStream() + public virtual Task CreateAsync(CancellationToken cancellationToken = default) { - var descriptor = new DataStreamRequestDescriptor(); + var descriptor = new CreateIndexRequestDescriptor(typeof(TDocument)); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequestAsync, CreateIndexResponse, CreateIndexRequestParameters>(descriptor); } - public virtual DataStreamResponse GetDataStream(Action configureRequest) + public virtual Task CreateAsync(Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new DataStreamRequestDescriptor(); + var descriptor = new CreateIndexRequestDescriptor(typeof(TDocument)); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequestAsync, CreateIndexResponse, CreateIndexRequestParameters>(descriptor); } - public virtual Task GetDataStreamAsync(CancellationToken cancellationToken = default) + public virtual Task CreateAsync(Elastic.Clients.Elasticsearch.IndexName index, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new DataStreamRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetDataStreamAsync(Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new DataStreamRequestDescriptor(); + var descriptor = new CreateIndexRequestDescriptor(index); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync, CreateIndexResponse, CreateIndexRequestParameters>(descriptor); } public virtual DeleteAliasResponse DeleteAlias(DeleteAliasRequest request) @@ -510,104 +410,104 @@ public virtual Task DeleteDataStreamAsync(Elastic.Clie return DoRequestAsync(descriptor); } - public virtual DeleteIndexTemplateResponse DeleteIndexTemplate(DeleteIndexTemplateRequest request) + public virtual DeleteIndexResponse Delete(DeleteIndexRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task DeleteIndexTemplateAsync(DeleteIndexTemplateRequest request, CancellationToken cancellationToken = default) + public virtual Task DeleteAsync(DeleteIndexRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual DeleteIndexTemplateResponse DeleteIndexTemplate(Elastic.Clients.Elasticsearch.Names name) + public virtual DeleteIndexResponse Delete(Elastic.Clients.Elasticsearch.Indices indices) { - var descriptor = new DeleteIndexTemplateRequestDescriptor(name); + var descriptor = new DeleteIndexRequestDescriptor(indices); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual DeleteIndexTemplateResponse DeleteIndexTemplate(Elastic.Clients.Elasticsearch.Names name, Action configureRequest) + public virtual DeleteIndexResponse Delete(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest) { - var descriptor = new DeleteIndexTemplateRequestDescriptor(name); + var descriptor = new DeleteIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual Task DeleteIndexTemplateAsync(Elastic.Clients.Elasticsearch.Names name, CancellationToken cancellationToken = default) + public virtual DeleteIndexResponse Delete(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest) { - var descriptor = new DeleteIndexTemplateRequestDescriptor(name); + var descriptor = new DeleteIndexRequestDescriptor(indices); + configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequest, DeleteIndexResponse, DeleteIndexRequestParameters>(descriptor); } - public virtual Task DeleteIndexTemplateAsync(Elastic.Clients.Elasticsearch.Names name, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Indices indices, CancellationToken cancellationToken = default) { - var descriptor = new DeleteIndexTemplateRequestDescriptor(name); - configureRequest?.Invoke(descriptor); + var descriptor = new DeleteIndexRequestDescriptor(indices); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual DeleteResponse Delete(DeleteRequest request) + public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest, CancellationToken cancellationToken = default) { - request.BeforeRequest(); - return DoRequest(request); + var descriptor = new DeleteIndexRequestDescriptor(indices); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); } - public virtual Task DeleteAsync(DeleteRequest request, CancellationToken cancellationToken = default) + public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest, CancellationToken cancellationToken = default) { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + var descriptor = new DeleteIndexRequestDescriptor(indices); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync, DeleteIndexResponse, DeleteIndexRequestParameters>(descriptor); } - public virtual DeleteResponse Delete(Elastic.Clients.Elasticsearch.Indices indices) + public virtual DeleteIndexTemplateResponse DeleteIndexTemplate(DeleteIndexTemplateRequest request) { - var descriptor = new DeleteRequestDescriptor(indices); - descriptor.BeforeRequest(); - return DoRequest(descriptor); + request.BeforeRequest(); + return DoRequest(request); } - public virtual DeleteResponse Delete(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest) + public virtual Task DeleteIndexTemplateAsync(DeleteIndexTemplateRequest request, CancellationToken cancellationToken = default) { - var descriptor = new DeleteRequestDescriptor(indices); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest(descriptor); + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); } - public virtual DeleteResponse Delete(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest) + public virtual DeleteIndexTemplateResponse DeleteIndexTemplate(Elastic.Clients.Elasticsearch.Names name) { - var descriptor = new DeleteRequestDescriptor(indices); - configureRequest?.Invoke(descriptor); + var descriptor = new DeleteIndexTemplateRequestDescriptor(name); descriptor.BeforeRequest(); - return DoRequest, DeleteResponse, DeleteRequestParameters>(descriptor); + return DoRequest(descriptor); } - public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Indices indices, CancellationToken cancellationToken = default) + public virtual DeleteIndexTemplateResponse DeleteIndexTemplate(Elastic.Clients.Elasticsearch.Names name, Action configureRequest) { - var descriptor = new DeleteRequestDescriptor(indices); + var descriptor = new DeleteIndexTemplateRequestDescriptor(name); + configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequest(descriptor); } - public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task DeleteIndexTemplateAsync(Elastic.Clients.Elasticsearch.Names name, CancellationToken cancellationToken = default) { - var descriptor = new DeleteRequestDescriptor(indices); - configureRequest?.Invoke(descriptor); + var descriptor = new DeleteIndexTemplateRequestDescriptor(name); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task DeleteAsync(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task DeleteIndexTemplateAsync(Elastic.Clients.Elasticsearch.Names name, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new DeleteRequestDescriptor(indices); + var descriptor = new DeleteIndexTemplateRequestDescriptor(name); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, DeleteResponse, DeleteRequestParameters>(descriptor); + return DoRequestAsync(descriptor); } public virtual DeleteTemplateResponse DeleteTemplate(DeleteTemplateRequest request) @@ -852,64 +752,6 @@ public virtual Task ExistsTemplateAsync(Elastic.Clients. return DoRequestAsync(descriptor); } - public virtual FieldMappingResponse GetFieldMapping(FieldMappingRequest request) - { - request.BeforeRequest(); - return DoRequest(request); - } - - public virtual Task GetFieldMappingAsync(FieldMappingRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); - } - - public virtual FieldMappingResponse GetFieldMapping(Elastic.Clients.Elasticsearch.Fields fields) - { - var descriptor = new FieldMappingRequestDescriptor(fields); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual FieldMappingResponse GetFieldMapping(Elastic.Clients.Elasticsearch.Fields fields, Action configureRequest) - { - var descriptor = new FieldMappingRequestDescriptor(fields); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual FieldMappingResponse GetFieldMapping(Elastic.Clients.Elasticsearch.Fields fields, Action> configureRequest) - { - var descriptor = new FieldMappingRequestDescriptor(fields); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, FieldMappingResponse, FieldMappingRequestParameters>(descriptor); - } - - public virtual Task GetFieldMappingAsync(Elastic.Clients.Elasticsearch.Fields fields, CancellationToken cancellationToken = default) - { - var descriptor = new FieldMappingRequestDescriptor(fields); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetFieldMappingAsync(Elastic.Clients.Elasticsearch.Fields fields, Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new FieldMappingRequestDescriptor(fields); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetFieldMappingAsync(Elastic.Clients.Elasticsearch.Fields fields, Action> configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new FieldMappingRequestDescriptor(fields); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync, FieldMappingResponse, FieldMappingRequestParameters>(descriptor); - } - public virtual FlushResponse Flush(FlushRequest request) { request.BeforeRequest(); @@ -1026,162 +868,420 @@ public virtual Task ForcemergeAsync(Action, ForcemergeResponse, ForcemergeRequestParameters>(descriptor); } - public virtual GetResponse Get(GetRequest request) + public virtual GetAliasResponse GetAlias(GetAliasRequest request) + { + request.BeforeRequest(); + return DoRequest(request); + } + + public virtual Task GetAliasAsync(GetAliasRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); + } + + public virtual GetAliasResponse GetAlias() + { + var descriptor = new GetAliasRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetAliasResponse GetAlias(Action configureRequest) + { + var descriptor = new GetAliasRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetAliasResponse GetAlias(Action> configureRequest) + { + var descriptor = new GetAliasRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest, GetAliasResponse, GetAliasRequestParameters>(descriptor); + } + + public virtual Task GetAliasAsync(CancellationToken cancellationToken = default) + { + var descriptor = new GetAliasRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetAliasAsync(Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetAliasRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetAliasAsync(Action> configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetAliasRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync, GetAliasResponse, GetAliasRequestParameters>(descriptor); + } + + public virtual GetDataStreamResponse GetDataStream(GetDataStreamRequest request) + { + request.BeforeRequest(); + return DoRequest(request); + } + + public virtual Task GetDataStreamAsync(GetDataStreamRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); + } + + public virtual GetDataStreamResponse GetDataStream() + { + var descriptor = new GetDataStreamRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetDataStreamResponse GetDataStream(Action configureRequest) + { + var descriptor = new GetDataStreamRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual Task GetDataStreamAsync(CancellationToken cancellationToken = default) + { + var descriptor = new GetDataStreamRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetDataStreamAsync(Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetDataStreamRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual GetFieldMappingResponse GetFieldMapping(GetFieldMappingRequest request) + { + request.BeforeRequest(); + return DoRequest(request); + } + + public virtual Task GetFieldMappingAsync(GetFieldMappingRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); + } + + public virtual GetFieldMappingResponse GetFieldMapping(Elastic.Clients.Elasticsearch.Fields fields) + { + var descriptor = new GetFieldMappingRequestDescriptor(fields); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetFieldMappingResponse GetFieldMapping(Elastic.Clients.Elasticsearch.Fields fields, Action configureRequest) + { + var descriptor = new GetFieldMappingRequestDescriptor(fields); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetFieldMappingResponse GetFieldMapping(Elastic.Clients.Elasticsearch.Fields fields, Action> configureRequest) + { + var descriptor = new GetFieldMappingRequestDescriptor(fields); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest, GetFieldMappingResponse, GetFieldMappingRequestParameters>(descriptor); + } + + public virtual Task GetFieldMappingAsync(Elastic.Clients.Elasticsearch.Fields fields, CancellationToken cancellationToken = default) + { + var descriptor = new GetFieldMappingRequestDescriptor(fields); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetFieldMappingAsync(Elastic.Clients.Elasticsearch.Fields fields, Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetFieldMappingRequestDescriptor(fields); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetFieldMappingAsync(Elastic.Clients.Elasticsearch.Fields fields, Action> configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetFieldMappingRequestDescriptor(fields); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync, GetFieldMappingResponse, GetFieldMappingRequestParameters>(descriptor); + } + + public virtual GetIndexResponse Get(GetIndexRequest request) + { + request.BeforeRequest(); + return DoRequest(request); + } + + public virtual Task GetAsync(GetIndexRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); + } + + public virtual GetIndexResponse Get(Elastic.Clients.Elasticsearch.Indices indices) + { + var descriptor = new GetIndexRequestDescriptor(indices); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetIndexResponse Get(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest) + { + var descriptor = new GetIndexRequestDescriptor(indices); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetIndexResponse Get(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest) + { + var descriptor = new GetIndexRequestDescriptor(indices); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest, GetIndexResponse, GetIndexRequestParameters>(descriptor); + } + + public virtual Task GetAsync(Elastic.Clients.Elasticsearch.Indices indices, CancellationToken cancellationToken = default) + { + var descriptor = new GetIndexRequestDescriptor(indices); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetAsync(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetIndexRequestDescriptor(indices); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetAsync(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetIndexRequestDescriptor(indices); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync, GetIndexResponse, GetIndexRequestParameters>(descriptor); + } + + public virtual GetIndexTemplateResponse GetIndexTemplate(GetIndexTemplateRequest request) + { + request.BeforeRequest(); + return DoRequest(request); + } + + public virtual Task GetIndexTemplateAsync(GetIndexTemplateRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); + } + + public virtual GetIndexTemplateResponse GetIndexTemplate() + { + var descriptor = new GetIndexTemplateRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetIndexTemplateResponse GetIndexTemplate(Action configureRequest) + { + var descriptor = new GetIndexTemplateRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual Task GetIndexTemplateAsync(CancellationToken cancellationToken = default) + { + var descriptor = new GetIndexTemplateRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetIndexTemplateAsync(Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetIndexTemplateRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual GetMappingResponse GetMapping(GetMappingRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task GetAsync(GetRequest request, CancellationToken cancellationToken = default) + public virtual Task GetMappingAsync(GetMappingRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual GetResponse Get(Elastic.Clients.Elasticsearch.Indices indices) + public virtual GetMappingResponse GetMapping() { - var descriptor = new GetRequestDescriptor(indices); + var descriptor = new GetMappingRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual GetResponse Get(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest) + public virtual GetMappingResponse GetMapping(Action configureRequest) { - var descriptor = new GetRequestDescriptor(indices); + var descriptor = new GetMappingRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual GetResponse Get(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest) + public virtual GetMappingResponse GetMapping(Action> configureRequest) { - var descriptor = new GetRequestDescriptor(indices); + var descriptor = new GetMappingRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, GetResponse, GetRequestParameters>(descriptor); + return DoRequest, GetMappingResponse, GetMappingRequestParameters>(descriptor); } - public virtual Task GetAsync(Elastic.Clients.Elasticsearch.Indices indices, CancellationToken cancellationToken = default) + public virtual Task GetMappingAsync(CancellationToken cancellationToken = default) { - var descriptor = new GetRequestDescriptor(indices); + var descriptor = new GetMappingRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetAsync(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task GetMappingAsync(Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new GetRequestDescriptor(indices); + var descriptor = new GetMappingRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetAsync(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task GetMappingAsync(Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new GetRequestDescriptor(indices); + var descriptor = new GetMappingRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, GetResponse, GetRequestParameters>(descriptor); + return DoRequestAsync, GetMappingResponse, GetMappingRequestParameters>(descriptor); } - public virtual IndexTemplateResponse GetIndexTemplate(IndexTemplateRequest request) + public virtual GetTemplateResponse GetTemplate(GetTemplateRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task GetIndexTemplateAsync(IndexTemplateRequest request, CancellationToken cancellationToken = default) + public virtual Task GetTemplateAsync(GetTemplateRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual IndexTemplateResponse GetIndexTemplate() + public virtual GetTemplateResponse GetTemplate() { - var descriptor = new IndexTemplateRequestDescriptor(); + var descriptor = new GetTemplateRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual IndexTemplateResponse GetIndexTemplate(Action configureRequest) + public virtual GetTemplateResponse GetTemplate(Action configureRequest) { - var descriptor = new IndexTemplateRequestDescriptor(); + var descriptor = new GetTemplateRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual Task GetIndexTemplateAsync(CancellationToken cancellationToken = default) + public virtual Task GetTemplateAsync(CancellationToken cancellationToken = default) { - var descriptor = new IndexTemplateRequestDescriptor(); + var descriptor = new GetTemplateRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetIndexTemplateAsync(Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task GetTemplateAsync(Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new IndexTemplateRequestDescriptor(); + var descriptor = new GetTemplateRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual MappingResponse GetMapping(MappingRequest request) + public virtual IndicesStatsResponse Stats(IndicesStatsRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task GetMappingAsync(MappingRequest request, CancellationToken cancellationToken = default) + public virtual Task StatsAsync(IndicesStatsRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual MappingResponse GetMapping() + public virtual IndicesStatsResponse Stats() { - var descriptor = new MappingRequestDescriptor(); + var descriptor = new IndicesStatsRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual MappingResponse GetMapping(Action configureRequest) + public virtual IndicesStatsResponse Stats(Action configureRequest) { - var descriptor = new MappingRequestDescriptor(); + var descriptor = new IndicesStatsRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual MappingResponse GetMapping(Action> configureRequest) + public virtual IndicesStatsResponse Stats(Action> configureRequest) { - var descriptor = new MappingRequestDescriptor(); + var descriptor = new IndicesStatsRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, MappingResponse, MappingRequestParameters>(descriptor); + return DoRequest, IndicesStatsResponse, IndicesStatsRequestParameters>(descriptor); } - public virtual Task GetMappingAsync(CancellationToken cancellationToken = default) + public virtual Task StatsAsync(CancellationToken cancellationToken = default) { - var descriptor = new MappingRequestDescriptor(); + var descriptor = new IndicesStatsRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetMappingAsync(Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task StatsAsync(Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new MappingRequestDescriptor(); + var descriptor = new IndicesStatsRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetMappingAsync(Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task StatsAsync(Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new MappingRequestDescriptor(); + var descriptor = new IndicesStatsRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, MappingResponse, MappingRequestParameters>(descriptor); + return DoRequestAsync, IndicesStatsResponse, IndicesStatsRequestParameters>(descriptor); } public virtual MigrateToDataStreamResponse MigrateToDataStream(MigrateToDataStreamRequest request) @@ -1226,62 +1326,62 @@ public virtual Task MigrateToDataStreamAsync(Elasti return DoRequestAsync(descriptor); } - public virtual OpenResponse Open(OpenRequest request) + public virtual OpenIndexResponse Open(OpenIndexRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task OpenAsync(OpenRequest request, CancellationToken cancellationToken = default) + public virtual Task OpenAsync(OpenIndexRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual OpenResponse Open(Elastic.Clients.Elasticsearch.Indices indices) + public virtual OpenIndexResponse Open(Elastic.Clients.Elasticsearch.Indices indices) { - var descriptor = new OpenRequestDescriptor(indices); + var descriptor = new OpenIndexRequestDescriptor(indices); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual OpenResponse Open(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest) + public virtual OpenIndexResponse Open(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest) { - var descriptor = new OpenRequestDescriptor(indices); + var descriptor = new OpenIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual OpenResponse Open(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest) + public virtual OpenIndexResponse Open(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest) { - var descriptor = new OpenRequestDescriptor(indices); + var descriptor = new OpenIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, OpenResponse, OpenRequestParameters>(descriptor); + return DoRequest, OpenIndexResponse, OpenIndexRequestParameters>(descriptor); } - public virtual Task OpenAsync(Elastic.Clients.Elasticsearch.Indices indices, CancellationToken cancellationToken = default) + public virtual Task OpenAsync(Elastic.Clients.Elasticsearch.Indices indices, CancellationToken cancellationToken = default) { - var descriptor = new OpenRequestDescriptor(indices); + var descriptor = new OpenIndexRequestDescriptor(indices); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task OpenAsync(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task OpenAsync(Elastic.Clients.Elasticsearch.Indices indices, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new OpenRequestDescriptor(indices); + var descriptor = new OpenIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task OpenAsync(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task OpenAsync(Elastic.Clients.Elasticsearch.Indices indices, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new OpenRequestDescriptor(indices); + var descriptor = new OpenIndexRequestDescriptor(indices); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, OpenResponse, OpenRequestParameters>(descriptor); + return DoRequestAsync, OpenIndexResponse, OpenIndexRequestParameters>(descriptor); } public virtual PutAliasResponse PutAlias(PutAliasRequest request) @@ -1600,92 +1700,92 @@ public virtual Task RolloverAsync(Elastic.Clients.Elasticsearc return DoRequestAsync(descriptor); } - public virtual ShrinkResponse Shrink(ShrinkRequest request) + public virtual ShrinkIndexResponse Shrink(ShrinkIndexRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task ShrinkAsync(ShrinkRequest request, CancellationToken cancellationToken = default) + public virtual Task ShrinkAsync(ShrinkIndexRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual ShrinkResponse Shrink(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) + public virtual ShrinkIndexResponse Shrink(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) { - var descriptor = new ShrinkRequestDescriptor(index, target); + var descriptor = new ShrinkIndexRequestDescriptor(index, target); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual ShrinkResponse Shrink(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action configureRequest) + public virtual ShrinkIndexResponse Shrink(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action configureRequest) { - var descriptor = new ShrinkRequestDescriptor(index, target); + var descriptor = new ShrinkIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual ShrinkResponse Shrink(Elastic.Clients.Elasticsearch.IndexName target) + public virtual ShrinkIndexResponse Shrink(Elastic.Clients.Elasticsearch.IndexName target) { - var descriptor = new ShrinkRequestDescriptor(typeof(TDocument), target); + var descriptor = new ShrinkIndexRequestDescriptor(typeof(TDocument), target); descriptor.BeforeRequest(); - return DoRequest, ShrinkResponse, ShrinkRequestParameters>(descriptor); + return DoRequest, ShrinkIndexResponse, ShrinkIndexRequestParameters>(descriptor); } - public virtual ShrinkResponse Shrink(Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest) + public virtual ShrinkIndexResponse Shrink(Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest) { - var descriptor = new ShrinkRequestDescriptor(typeof(TDocument), target); + var descriptor = new ShrinkIndexRequestDescriptor(typeof(TDocument), target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, ShrinkResponse, ShrinkRequestParameters>(descriptor); + return DoRequest, ShrinkIndexResponse, ShrinkIndexRequestParameters>(descriptor); } - public virtual ShrinkResponse Shrink(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest) + public virtual ShrinkIndexResponse Shrink(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest) { - var descriptor = new ShrinkRequestDescriptor(index, target); + var descriptor = new ShrinkIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, ShrinkResponse, ShrinkRequestParameters>(descriptor); + return DoRequest, ShrinkIndexResponse, ShrinkIndexRequestParameters>(descriptor); } - public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, CancellationToken cancellationToken = default) + public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, CancellationToken cancellationToken = default) { - var descriptor = new ShrinkRequestDescriptor(index, target); + var descriptor = new ShrinkIndexRequestDescriptor(index, target); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new ShrinkRequestDescriptor(index, target); + var descriptor = new ShrinkIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName target, CancellationToken cancellationToken = default) + public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName target, CancellationToken cancellationToken = default) { - var descriptor = new ShrinkRequestDescriptor(typeof(TDocument), target); + var descriptor = new ShrinkIndexRequestDescriptor(typeof(TDocument), target); descriptor.BeforeRequest(); - return DoRequestAsync, ShrinkResponse, ShrinkRequestParameters>(descriptor); + return DoRequestAsync, ShrinkIndexResponse, ShrinkIndexRequestParameters>(descriptor); } - public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new ShrinkRequestDescriptor(typeof(TDocument), target); + var descriptor = new ShrinkIndexRequestDescriptor(typeof(TDocument), target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, ShrinkResponse, ShrinkRequestParameters>(descriptor); + return DoRequestAsync, ShrinkIndexResponse, ShrinkIndexRequestParameters>(descriptor); } - public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task ShrinkAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new ShrinkRequestDescriptor(index, target); + var descriptor = new ShrinkIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, ShrinkResponse, ShrinkRequestParameters>(descriptor); + return DoRequestAsync, ShrinkIndexResponse, ShrinkIndexRequestParameters>(descriptor); } public virtual SimulateIndexTemplateResponse SimulateIndexTemplate(SimulateIndexTemplateRequest request) @@ -1788,191 +1888,91 @@ public virtual Task SimulateTemplateAsync(Action(descriptor); } - public virtual SplitResponse Split(SplitRequest request) + public virtual SplitIndexResponse Split(SplitIndexRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task SplitAsync(SplitRequest request, CancellationToken cancellationToken = default) + public virtual Task SplitAsync(SplitIndexRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); - } - - public virtual SplitResponse Split(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) - { - var descriptor = new SplitRequestDescriptor(index, target); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual SplitResponse Split(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action configureRequest) - { - var descriptor = new SplitRequestDescriptor(index, target); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual SplitResponse Split(Elastic.Clients.Elasticsearch.IndexName target) - { - var descriptor = new SplitRequestDescriptor(typeof(TDocument), target); - descriptor.BeforeRequest(); - return DoRequest, SplitResponse, SplitRequestParameters>(descriptor); - } - - public virtual SplitResponse Split(Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest) - { - var descriptor = new SplitRequestDescriptor(typeof(TDocument), target); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, SplitResponse, SplitRequestParameters>(descriptor); - } - - public virtual SplitResponse Split(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest) - { - var descriptor = new SplitRequestDescriptor(index, target); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, SplitResponse, SplitRequestParameters>(descriptor); + return DoRequestAsync(request, cancellationToken); } - public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, CancellationToken cancellationToken = default) + public virtual SplitIndexResponse Split(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) { - var descriptor = new SplitRequestDescriptor(index, target); + var descriptor = new SplitIndexRequestDescriptor(index, target); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequest(descriptor); } - public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action configureRequest, CancellationToken cancellationToken = default) + public virtual SplitIndexResponse Split(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action configureRequest) { - var descriptor = new SplitRequestDescriptor(index, target); + var descriptor = new SplitIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName target, CancellationToken cancellationToken = default) - { - var descriptor = new SplitRequestDescriptor(typeof(TDocument), target); - descriptor.BeforeRequest(); - return DoRequestAsync, SplitResponse, SplitRequestParameters>(descriptor); - } - - public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new SplitRequestDescriptor(typeof(TDocument), target); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync, SplitResponse, SplitRequestParameters>(descriptor); - } - - public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new SplitRequestDescriptor(index, target); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync, SplitResponse, SplitRequestParameters>(descriptor); - } - - public virtual StatsResponse Stats(StatsRequest request) - { - request.BeforeRequest(); - return DoRequest(request); - } - - public virtual Task StatsAsync(StatsRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequest(descriptor); } - public virtual StatsResponse Stats() + public virtual SplitIndexResponse Split(Elastic.Clients.Elasticsearch.IndexName target) { - var descriptor = new StatsRequestDescriptor(); + var descriptor = new SplitIndexRequestDescriptor(typeof(TDocument), target); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest, SplitIndexResponse, SplitIndexRequestParameters>(descriptor); } - public virtual StatsResponse Stats(Action configureRequest) + public virtual SplitIndexResponse Split(Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest) { - var descriptor = new StatsRequestDescriptor(); + var descriptor = new SplitIndexRequestDescriptor(typeof(TDocument), target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest, SplitIndexResponse, SplitIndexRequestParameters>(descriptor); } - public virtual StatsResponse Stats(Action> configureRequest) + public virtual SplitIndexResponse Split(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest) { - var descriptor = new StatsRequestDescriptor(); + var descriptor = new SplitIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, StatsResponse, StatsRequestParameters>(descriptor); + return DoRequest, SplitIndexResponse, SplitIndexRequestParameters>(descriptor); } - public virtual Task StatsAsync(CancellationToken cancellationToken = default) + public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, CancellationToken cancellationToken = default) { - var descriptor = new StatsRequestDescriptor(); + var descriptor = new SplitIndexRequestDescriptor(index, target); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task StatsAsync(Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new StatsRequestDescriptor(); + var descriptor = new SplitIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task StatsAsync(Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName target, CancellationToken cancellationToken = default) { - var descriptor = new StatsRequestDescriptor(); - configureRequest?.Invoke(descriptor); + var descriptor = new SplitIndexRequestDescriptor(typeof(TDocument), target); descriptor.BeforeRequest(); - return DoRequestAsync, StatsResponse, StatsRequestParameters>(descriptor); - } - - public virtual TemplateResponse GetTemplate(TemplateRequest request) - { - request.BeforeRequest(); - return DoRequest(request); + return DoRequestAsync, SplitIndexResponse, SplitIndexRequestParameters>(descriptor); } - public virtual Task GetTemplateAsync(TemplateRequest request, CancellationToken cancellationToken = default) + public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest, CancellationToken cancellationToken = default) { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); - } - - public virtual TemplateResponse GetTemplate() - { - var descriptor = new TemplateRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual TemplateResponse GetTemplate(Action configureRequest) - { - var descriptor = new TemplateRequestDescriptor(); + var descriptor = new SplitIndexRequestDescriptor(typeof(TDocument), target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual Task GetTemplateAsync(CancellationToken cancellationToken = default) - { - var descriptor = new TemplateRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync, SplitIndexResponse, SplitIndexRequestParameters>(descriptor); } - public virtual Task GetTemplateAsync(Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task SplitAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new TemplateRequestDescriptor(); + var descriptor = new SplitIndexRequestDescriptor(index, target); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync, SplitIndexResponse, SplitIndexRequestParameters>(descriptor); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Sql.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Sql.g.cs index 1aeac81e1a6..03f32e84c1e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Sql.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Sql.g.cs @@ -34,277 +34,277 @@ internal SqlNamespacedClient(ElasticsearchClient client) : base(client) { } - public virtual SqlClearCursorResponse ClearCursor(SqlClearCursorRequest request) + public virtual ClearCursorResponse ClearCursor(ClearCursorRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task ClearCursorAsync(SqlClearCursorRequest request, CancellationToken cancellationToken = default) + public virtual Task ClearCursorAsync(ClearCursorRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual SqlClearCursorResponse ClearCursor() + public virtual ClearCursorResponse ClearCursor() { - var descriptor = new SqlClearCursorRequestDescriptor(); + var descriptor = new ClearCursorRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlClearCursorResponse ClearCursor(Action configureRequest) + public virtual ClearCursorResponse ClearCursor(Action configureRequest) { - var descriptor = new SqlClearCursorRequestDescriptor(); + var descriptor = new ClearCursorRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual Task ClearCursorAsync(CancellationToken cancellationToken = default) + public virtual Task ClearCursorAsync(CancellationToken cancellationToken = default) { - var descriptor = new SqlClearCursorRequestDescriptor(); + var descriptor = new ClearCursorRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task ClearCursorAsync(Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task ClearCursorAsync(Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlClearCursorRequestDescriptor(); + var descriptor = new ClearCursorRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual SqlDeleteAsyncResponse DeleteAsyncSearch(SqlDeleteAsyncRequest request) + public virtual DeleteAsyncResponse DeleteAsyncSearch(DeleteAsyncRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task DeleteAsyncSearchAsync(SqlDeleteAsyncRequest request, CancellationToken cancellationToken = default) + public virtual Task DeleteAsyncSearchAsync(DeleteAsyncRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual SqlDeleteAsyncResponse DeleteAsyncSearch(Elastic.Clients.Elasticsearch.Id id) + public virtual DeleteAsyncResponse DeleteAsyncSearch(Elastic.Clients.Elasticsearch.Id id) { - var descriptor = new SqlDeleteAsyncRequestDescriptor(id); + var descriptor = new DeleteAsyncRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlDeleteAsyncResponse DeleteAsyncSearch(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) + public virtual DeleteAsyncResponse DeleteAsyncSearch(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) { - var descriptor = new SqlDeleteAsyncRequestDescriptor(id); + var descriptor = new DeleteAsyncRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlDeleteAsyncResponse DeleteAsyncSearch(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) + public virtual DeleteAsyncResponse DeleteAsyncSearch(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) { - var descriptor = new SqlDeleteAsyncRequestDescriptor(id); + var descriptor = new DeleteAsyncRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, SqlDeleteAsyncResponse, SqlDeleteAsyncRequestParameters>(descriptor); + return DoRequest, DeleteAsyncResponse, DeleteAsyncRequestParameters>(descriptor); } - public virtual Task DeleteAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + public virtual Task DeleteAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) { - var descriptor = new SqlDeleteAsyncRequestDescriptor(id); + var descriptor = new DeleteAsyncRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task DeleteAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task DeleteAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlDeleteAsyncRequestDescriptor(id); + var descriptor = new DeleteAsyncRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task DeleteAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task DeleteAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlDeleteAsyncRequestDescriptor(id); + var descriptor = new DeleteAsyncRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, SqlDeleteAsyncResponse, SqlDeleteAsyncRequestParameters>(descriptor); + return DoRequestAsync, DeleteAsyncResponse, DeleteAsyncRequestParameters>(descriptor); } - public virtual SqlGetAsyncResponse GetAsyncSearch(SqlGetAsyncRequest request) + public virtual GetAsyncResponse GetAsyncSearch(GetAsyncRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task GetAsyncSearchAsync(SqlGetAsyncRequest request, CancellationToken cancellationToken = default) + public virtual Task GetAsyncSearchAsync(GetAsyncRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual SqlGetAsyncResponse GetAsyncSearch(Elastic.Clients.Elasticsearch.Id id) + public virtual GetAsyncResponse GetAsyncSearch(Elastic.Clients.Elasticsearch.Id id) { - var descriptor = new SqlGetAsyncRequestDescriptor(id); + var descriptor = new GetAsyncRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlGetAsyncResponse GetAsyncSearch(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) + public virtual GetAsyncResponse GetAsyncSearch(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) { - var descriptor = new SqlGetAsyncRequestDescriptor(id); + var descriptor = new GetAsyncRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlGetAsyncResponse GetAsyncSearch(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) + public virtual GetAsyncResponse GetAsyncSearch(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) { - var descriptor = new SqlGetAsyncRequestDescriptor(id); + var descriptor = new GetAsyncRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, SqlGetAsyncResponse, SqlGetAsyncRequestParameters>(descriptor); + return DoRequest, GetAsyncResponse, GetAsyncRequestParameters>(descriptor); } - public virtual Task GetAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + public virtual Task GetAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) { - var descriptor = new SqlGetAsyncRequestDescriptor(id); + var descriptor = new GetAsyncRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task GetAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlGetAsyncRequestDescriptor(id); + var descriptor = new GetAsyncRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task GetAsyncSearchAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlGetAsyncRequestDescriptor(id); + var descriptor = new GetAsyncRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, SqlGetAsyncResponse, SqlGetAsyncRequestParameters>(descriptor); + return DoRequestAsync, GetAsyncResponse, GetAsyncRequestParameters>(descriptor); } - public virtual SqlGetAsyncStatusResponse GetAsyncSearchStatus(SqlGetAsyncStatusRequest request) + public virtual GetAsyncStatusResponse GetAsyncSearchStatus(GetAsyncStatusRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task GetAsyncSearchStatusAsync(SqlGetAsyncStatusRequest request, CancellationToken cancellationToken = default) + public virtual Task GetAsyncSearchStatusAsync(GetAsyncStatusRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual SqlGetAsyncStatusResponse GetAsyncSearchStatus(Elastic.Clients.Elasticsearch.Id id) + public virtual GetAsyncStatusResponse GetAsyncSearchStatus(Elastic.Clients.Elasticsearch.Id id) { - var descriptor = new SqlGetAsyncStatusRequestDescriptor(id); + var descriptor = new GetAsyncStatusRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlGetAsyncStatusResponse GetAsyncSearchStatus(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) + public virtual GetAsyncStatusResponse GetAsyncSearchStatus(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) { - var descriptor = new SqlGetAsyncStatusRequestDescriptor(id); + var descriptor = new GetAsyncStatusRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlGetAsyncStatusResponse GetAsyncSearchStatus(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) + public virtual GetAsyncStatusResponse GetAsyncSearchStatus(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) { - var descriptor = new SqlGetAsyncStatusRequestDescriptor(id); + var descriptor = new GetAsyncStatusRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, SqlGetAsyncStatusResponse, SqlGetAsyncStatusRequestParameters>(descriptor); + return DoRequest, GetAsyncStatusResponse, GetAsyncStatusRequestParameters>(descriptor); } - public virtual Task GetAsyncSearchStatusAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + public virtual Task GetAsyncSearchStatusAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) { - var descriptor = new SqlGetAsyncStatusRequestDescriptor(id); + var descriptor = new GetAsyncStatusRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetAsyncSearchStatusAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task GetAsyncSearchStatusAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlGetAsyncStatusRequestDescriptor(id); + var descriptor = new GetAsyncStatusRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task GetAsyncSearchStatusAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task GetAsyncSearchStatusAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlGetAsyncStatusRequestDescriptor(id); + var descriptor = new GetAsyncStatusRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, SqlGetAsyncStatusResponse, SqlGetAsyncStatusRequestParameters>(descriptor); + return DoRequestAsync, GetAsyncStatusResponse, GetAsyncStatusRequestParameters>(descriptor); } - public virtual SqlQueryResponse Query(SqlQueryRequest request) + public virtual QueryResponse Query(QueryRequest request) { request.BeforeRequest(); - return DoRequest(request); + return DoRequest(request); } - public virtual Task QueryAsync(SqlQueryRequest request, CancellationToken cancellationToken = default) + public virtual Task QueryAsync(QueryRequest request, CancellationToken cancellationToken = default) { request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); + return DoRequestAsync(request, cancellationToken); } - public virtual SqlQueryResponse Query() + public virtual QueryResponse Query() { - var descriptor = new SqlQueryRequestDescriptor(); + var descriptor = new QueryRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlQueryResponse Query(Action configureRequest) + public virtual QueryResponse Query(Action configureRequest) { - var descriptor = new SqlQueryRequestDescriptor(); + var descriptor = new QueryRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest(descriptor); + return DoRequest(descriptor); } - public virtual SqlQueryResponse Query(Action> configureRequest) + public virtual QueryResponse Query(Action> configureRequest) { - var descriptor = new SqlQueryRequestDescriptor(); + var descriptor = new QueryRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequest, SqlQueryResponse, SqlQueryRequestParameters>(descriptor); + return DoRequest, QueryResponse, QueryRequestParameters>(descriptor); } - public virtual Task QueryAsync(CancellationToken cancellationToken = default) + public virtual Task QueryAsync(CancellationToken cancellationToken = default) { - var descriptor = new SqlQueryRequestDescriptor(); + var descriptor = new QueryRequestDescriptor(); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task QueryAsync(Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task QueryAsync(Action configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlQueryRequestDescriptor(); + var descriptor = new QueryRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); + return DoRequestAsync(descriptor); } - public virtual Task QueryAsync(Action> configureRequest, CancellationToken cancellationToken = default) + public virtual Task QueryAsync(Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new SqlQueryRequestDescriptor(); + var descriptor = new QueryRequestDescriptor(); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, SqlQueryResponse, SqlQueryRequestParameters>(descriptor); + return DoRequestAsync, QueryResponse, QueryRequestParameters>(descriptor); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs index 7efe3064843..1a633de0ad1 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs @@ -943,6 +943,220 @@ public virtual Task> GetAsync(Elastic.Clients. return DoRequestAsync, GetResponse, GetRequestParameters>(descriptor); } + public virtual GetScriptContextResponse GetScriptContext(GetScriptContextRequest request) + { + request.BeforeRequest(); + return DoRequest(request); + } + + public virtual Task GetScriptContextAsync(GetScriptContextRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); + } + + public virtual GetScriptContextResponse GetScriptContext() + { + var descriptor = new GetScriptContextRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetScriptContextResponse GetScriptContext(Action configureRequest) + { + var descriptor = new GetScriptContextRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual Task GetScriptContextAsync(CancellationToken cancellationToken = default) + { + var descriptor = new GetScriptContextRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetScriptContextAsync(Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetScriptContextRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual GetScriptLanguagesResponse GetScriptLanguages(GetScriptLanguagesRequest request) + { + request.BeforeRequest(); + return DoRequest(request); + } + + public virtual Task GetScriptLanguagesAsync(GetScriptLanguagesRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); + } + + public virtual GetScriptLanguagesResponse GetScriptLanguages() + { + var descriptor = new GetScriptLanguagesRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetScriptLanguagesResponse GetScriptLanguages(Action configureRequest) + { + var descriptor = new GetScriptLanguagesRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual Task GetScriptLanguagesAsync(CancellationToken cancellationToken = default) + { + var descriptor = new GetScriptLanguagesRequestDescriptor(); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetScriptLanguagesAsync(Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetScriptLanguagesRequestDescriptor(); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual GetScriptResponse GetScript(GetScriptRequest request) + { + request.BeforeRequest(); + return DoRequest(request); + } + + public virtual Task GetScriptAsync(GetScriptRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync(request, cancellationToken); + } + + public virtual GetScriptResponse GetScript(Elastic.Clients.Elasticsearch.Id id) + { + var descriptor = new GetScriptRequestDescriptor(id); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetScriptResponse GetScript(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) + { + var descriptor = new GetScriptRequestDescriptor(id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest(descriptor); + } + + public virtual GetScriptResponse GetScript(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) + { + var descriptor = new GetScriptRequestDescriptor(id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest, GetScriptResponse, GetScriptRequestParameters>(descriptor); + } + + public virtual Task GetScriptAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + { + var descriptor = new GetScriptRequestDescriptor(id); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetScriptAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetScriptRequestDescriptor(id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync(descriptor); + } + + public virtual Task GetScriptAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetScriptRequestDescriptor(id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync, GetScriptResponse, GetScriptRequestParameters>(descriptor); + } + + public virtual GetSourceResponse GetSource(GetSourceRequest request) + { + request.BeforeRequest(); + return DoRequest, GetSourceRequestParameters>(request); + } + + public virtual Task> GetSourceAsync(GetSourceRequest request, CancellationToken cancellationToken = default) + { + request.BeforeRequest(); + return DoRequestAsync, GetSourceRequestParameters>(request, cancellationToken); + } + + public virtual GetSourceResponse GetSource(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) + { + var descriptor = new GetSourceRequestDescriptor(index, id); + descriptor.BeforeRequest(); + return DoRequest, GetSourceResponse, GetSourceRequestParameters>(descriptor); + } + + public virtual GetSourceResponse GetSource(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) + { + var descriptor = new GetSourceRequestDescriptor(index, id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest, GetSourceResponse, GetSourceRequestParameters>(descriptor); + } + + public virtual GetSourceResponse GetSource(Elastic.Clients.Elasticsearch.Id id) + { + var descriptor = new GetSourceRequestDescriptor(typeof(TDocument), id); + descriptor.BeforeRequest(); + return DoRequest, GetSourceResponse, GetSourceRequestParameters>(descriptor); + } + + public virtual GetSourceResponse GetSource(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) + { + var descriptor = new GetSourceRequestDescriptor(typeof(TDocument), id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequest, GetSourceResponse, GetSourceRequestParameters>(descriptor); + } + + public virtual Task> GetSourceAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + { + var descriptor = new GetSourceRequestDescriptor(index, id); + descriptor.BeforeRequest(); + return DoRequestAsync, GetSourceResponse, GetSourceRequestParameters>(descriptor); + } + + public virtual Task> GetSourceAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetSourceRequestDescriptor(index, id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync, GetSourceResponse, GetSourceRequestParameters>(descriptor); + } + + public virtual Task> GetSourceAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) + { + var descriptor = new GetSourceRequestDescriptor(typeof(TDocument), id); + descriptor.BeforeRequest(); + return DoRequestAsync, GetSourceResponse, GetSourceRequestParameters>(descriptor); + } + + public virtual Task> GetSourceAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) + { + var descriptor = new GetSourceRequestDescriptor(typeof(TDocument), id); + configureRequest?.Invoke(descriptor); + descriptor.BeforeRequest(); + return DoRequestAsync, GetSourceResponse, GetSourceRequestParameters>(descriptor); + } + public virtual IndexResponse Index(IndexRequest request) { request.BeforeRequest(); @@ -1499,148 +1713,6 @@ public virtual Task ReindexRethrottleAsync(Elastic.Cl return DoRequestAsync(descriptor); } - public virtual ScriptContextResponse GetScriptContext(ScriptContextRequest request) - { - request.BeforeRequest(); - return DoRequest(request); - } - - public virtual Task GetScriptContextAsync(ScriptContextRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); - } - - public virtual ScriptContextResponse GetScriptContext() - { - var descriptor = new ScriptContextRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual ScriptContextResponse GetScriptContext(Action configureRequest) - { - var descriptor = new ScriptContextRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual Task GetScriptContextAsync(CancellationToken cancellationToken = default) - { - var descriptor = new ScriptContextRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetScriptContextAsync(Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new ScriptContextRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual ScriptLanguagesResponse GetScriptLanguages(ScriptLanguagesRequest request) - { - request.BeforeRequest(); - return DoRequest(request); - } - - public virtual Task GetScriptLanguagesAsync(ScriptLanguagesRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); - } - - public virtual ScriptLanguagesResponse GetScriptLanguages() - { - var descriptor = new ScriptLanguagesRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual ScriptLanguagesResponse GetScriptLanguages(Action configureRequest) - { - var descriptor = new ScriptLanguagesRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual Task GetScriptLanguagesAsync(CancellationToken cancellationToken = default) - { - var descriptor = new ScriptLanguagesRequestDescriptor(); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetScriptLanguagesAsync(Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new ScriptLanguagesRequestDescriptor(); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual ScriptResponse GetScript(ScriptRequest request) - { - request.BeforeRequest(); - return DoRequest(request); - } - - public virtual Task GetScriptAsync(ScriptRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync(request, cancellationToken); - } - - public virtual ScriptResponse GetScript(Elastic.Clients.Elasticsearch.Id id) - { - var descriptor = new ScriptRequestDescriptor(id); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual ScriptResponse GetScript(Elastic.Clients.Elasticsearch.Id id, Action configureRequest) - { - var descriptor = new ScriptRequestDescriptor(id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest(descriptor); - } - - public virtual ScriptResponse GetScript(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) - { - var descriptor = new ScriptRequestDescriptor(id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, ScriptResponse, ScriptRequestParameters>(descriptor); - } - - public virtual Task GetScriptAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) - { - var descriptor = new ScriptRequestDescriptor(id); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetScriptAsync(Elastic.Clients.Elasticsearch.Id id, Action configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new ScriptRequestDescriptor(id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync(descriptor); - } - - public virtual Task GetScriptAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new ScriptRequestDescriptor(id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync, ScriptResponse, ScriptRequestParameters>(descriptor); - } - public virtual ScrollResponse Scroll(ScrollRequest request) { request.BeforeRequest(); @@ -1783,78 +1855,6 @@ public virtual Task SearchShardsAsync(Action, SearchShardsResponse, SearchShardsRequestParameters>(descriptor); } - public virtual SourceResponse GetSource(SourceRequest request) - { - request.BeforeRequest(); - return DoRequest, SourceRequestParameters>(request); - } - - public virtual Task> GetSourceAsync(SourceRequest request, CancellationToken cancellationToken = default) - { - request.BeforeRequest(); - return DoRequestAsync, SourceRequestParameters>(request, cancellationToken); - } - - public virtual SourceResponse GetSource(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) - { - var descriptor = new SourceRequestDescriptor(index, id); - descriptor.BeforeRequest(); - return DoRequest, SourceResponse, SourceRequestParameters>(descriptor); - } - - public virtual SourceResponse GetSource(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) - { - var descriptor = new SourceRequestDescriptor(index, id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, SourceResponse, SourceRequestParameters>(descriptor); - } - - public virtual SourceResponse GetSource(Elastic.Clients.Elasticsearch.Id id) - { - var descriptor = new SourceRequestDescriptor(typeof(TDocument), id); - descriptor.BeforeRequest(); - return DoRequest, SourceResponse, SourceRequestParameters>(descriptor); - } - - public virtual SourceResponse GetSource(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest) - { - var descriptor = new SourceRequestDescriptor(typeof(TDocument), id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequest, SourceResponse, SourceRequestParameters>(descriptor); - } - - public virtual Task> GetSourceAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) - { - var descriptor = new SourceRequestDescriptor(index, id); - descriptor.BeforeRequest(); - return DoRequestAsync, SourceResponse, SourceRequestParameters>(descriptor); - } - - public virtual Task> GetSourceAsync(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new SourceRequestDescriptor(index, id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync, SourceResponse, SourceRequestParameters>(descriptor); - } - - public virtual Task> GetSourceAsync(Elastic.Clients.Elasticsearch.Id id, CancellationToken cancellationToken = default) - { - var descriptor = new SourceRequestDescriptor(typeof(TDocument), id); - descriptor.BeforeRequest(); - return DoRequestAsync, SourceResponse, SourceRequestParameters>(descriptor); - } - - public virtual Task> GetSourceAsync(Elastic.Clients.Elasticsearch.Id id, Action> configureRequest, CancellationToken cancellationToken = default) - { - var descriptor = new SourceRequestDescriptor(typeof(TDocument), id); - configureRequest?.Invoke(descriptor); - descriptor.BeforeRequest(); - return DoRequestAsync, SourceResponse, SourceRequestParameters>(descriptor); - } - public virtual TermsEnumResponse TermsEnum(TermsEnumRequest request) { request.BeforeRequest(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregation.g.cs index f8ec416388b..5895e2339fd 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregation.g.cs @@ -43,7 +43,7 @@ public override AdjacencyMatrixAggregation Read(ref Utf8JsonReader reader, Type if (reader.ValueTextEquals("filters")) { reader.Read(); - var value = JsonSerializer.Deserialize?>(ref reader, options); + var value = JsonSerializer.Deserialize?>(ref reader, options); if (value is not null) { agg.Filters = value; @@ -114,7 +114,7 @@ public override void Write(Utf8JsonWriter writer, AdjacencyMatrixAggregation val } [JsonConverter(typeof(AdjacencyMatrixAggregationConverter))] -public sealed partial class AdjacencyMatrixAggregation : Aggregation +public sealed partial class AdjacencyMatrixAggregation : SearchAggregation { public AdjacencyMatrixAggregation(string name) => Name = name; internal AdjacencyMatrixAggregation() @@ -123,7 +123,7 @@ internal AdjacencyMatrixAggregation() public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; } - public Dictionary? Filters { get; set; } + public Dictionary? Filters { get; set; } public Dictionary? Meta { get; set; } @@ -139,11 +139,11 @@ public AdjacencyMatrixAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } - private Dictionary? FiltersValue { get; set; } + private Dictionary? FiltersValue { get; set; } private Dictionary? MetaValue { get; set; } @@ -155,7 +155,7 @@ public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clie return Self; } - public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -163,7 +163,7 @@ public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clie return Self; } - public AdjacencyMatrixAggregationDescriptor Aggregations(Action> configure) + public AdjacencyMatrixAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -171,9 +171,9 @@ public AdjacencyMatrixAggregationDescriptor Aggregations(Action Filters(Func, FluentDictionary> selector) + public AdjacencyMatrixAggregationDescriptor Filters(Func, FluentDictionary> selector) { - FiltersValue = selector?.Invoke(new FluentDictionary()); + FiltersValue = selector?.Invoke(new FluentDictionary()); return Self; } @@ -209,7 +209,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -230,11 +230,11 @@ public AdjacencyMatrixAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } - private Dictionary? FiltersValue { get; set; } + private Dictionary? FiltersValue { get; set; } private Dictionary? MetaValue { get; set; } @@ -246,7 +246,7 @@ public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clients.Elastic return Self; } - public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -254,7 +254,7 @@ public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clients.Elastic return Self; } - public AdjacencyMatrixAggregationDescriptor Aggregations(Action configure) + public AdjacencyMatrixAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -262,9 +262,9 @@ public AdjacencyMatrixAggregationDescriptor Aggregations(Action, FluentDictionary> selector) + public AdjacencyMatrixAggregationDescriptor Filters(Func, FluentDictionary> selector) { - FiltersValue = selector?.Invoke(new FluentDictionary()); + FiltersValue = selector?.Invoke(new FluentDictionary()); return Self; } @@ -300,7 +300,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs new file mode 100644 index 00000000000..62db9e6a374 --- /dev/null +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs @@ -0,0 +1,921 @@ +// 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. +// +// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ +// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ +// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ +// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ +// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ +// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ +// ------------------------------------------------ +// +// This file is automatically generated. +// Please do not edit these files manually. +// +// ------------------------------------------------ + +using Elastic.Clients.Elasticsearch.Fluent; +using Elastic.Clients.Elasticsearch.Serialization; +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Text.Json; +using System.Text.Json.Serialization; + +#nullable restore +namespace Elastic.Clients.Elasticsearch.Aggregations; +[JsonConverter(typeof(AggregationConverter))] +public sealed partial class Aggregation +{ + internal Aggregation(ISearchAggregation variant) => Variant = variant ?? throw new ArgumentNullException(nameof(variant)); + internal ISearchAggregation Variant { get; } +} + +internal sealed class AggregationConverter : JsonConverter +{ + public override Aggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + var readerCopy = reader; + readerCopy.Read(); + if (readerCopy.TokenType != JsonTokenType.PropertyName) + { + throw new JsonException(); + } + + var propertyName = readerCopy.GetString(); + if (propertyName == "adjacency_matrix") + { + return AggregationSerializationHelper.ReadContainer("adjacency_matrix", ref reader, options); + } + + if (propertyName == "auto_date_histogram") + { + return AggregationSerializationHelper.ReadContainer("auto_date_histogram", ref reader, options); + } + + if (propertyName == "avg") + { + return AggregationSerializationHelper.ReadContainer("avg", ref reader, options); + } + + if (propertyName == "boxplot") + { + return AggregationSerializationHelper.ReadContainer("boxplot", ref reader, options); + } + + if (propertyName == "cardinality") + { + return AggregationSerializationHelper.ReadContainer("cardinality", ref reader, options); + } + + if (propertyName == "children") + { + return AggregationSerializationHelper.ReadContainer("children", ref reader, options); + } + + if (propertyName == "composite") + { + return AggregationSerializationHelper.ReadContainer("composite", ref reader, options); + } + + if (propertyName == "cumulative_cardinality") + { + return AggregationSerializationHelper.ReadContainer("cumulative_cardinality", ref reader, options); + } + + if (propertyName == "date_histogram") + { + return AggregationSerializationHelper.ReadContainer("date_histogram", ref reader, options); + } + + if (propertyName == "date_range") + { + return AggregationSerializationHelper.ReadContainer("date_range", ref reader, options); + } + + if (propertyName == "derivative") + { + return AggregationSerializationHelper.ReadContainer("derivative", ref reader, options); + } + + if (propertyName == "extended_stats") + { + return AggregationSerializationHelper.ReadContainer("extended_stats", ref reader, options); + } + + if (propertyName == "extended_stats_bucket") + { + return AggregationSerializationHelper.ReadContainer("extended_stats_bucket", ref reader, options); + } + + if (propertyName == "filters") + { + return AggregationSerializationHelper.ReadContainer("filters", ref reader, options); + } + + if (propertyName == "global") + { + return AggregationSerializationHelper.ReadContainer("global", ref reader, options); + } + + if (propertyName == "histogram") + { + return AggregationSerializationHelper.ReadContainer("histogram", ref reader, options); + } + + if (propertyName == "inference") + { + return AggregationSerializationHelper.ReadContainer("inference", ref reader, options); + } + + if (propertyName == "ip_range") + { + return AggregationSerializationHelper.ReadContainer("ip_range", ref reader, options); + } + + if (propertyName == "matrix_stats") + { + return AggregationSerializationHelper.ReadContainer("matrix_stats", ref reader, options); + } + + if (propertyName == "max") + { + return AggregationSerializationHelper.ReadContainer("max", ref reader, options); + } + + if (propertyName == "median_absolute_deviation") + { + return AggregationSerializationHelper.ReadContainer("median_absolute_deviation", ref reader, options); + } + + if (propertyName == "min") + { + return AggregationSerializationHelper.ReadContainer("min", ref reader, options); + } + + if (propertyName == "missing") + { + return AggregationSerializationHelper.ReadContainer("missing", ref reader, options); + } + + if (propertyName == "multi_terms") + { + return AggregationSerializationHelper.ReadContainer("multi_terms", ref reader, options); + } + + if (propertyName == "nested") + { + return AggregationSerializationHelper.ReadContainer("nested", ref reader, options); + } + + if (propertyName == "parent") + { + return AggregationSerializationHelper.ReadContainer("parent", ref reader, options); + } + + if (propertyName == "percentiles_bucket") + { + return AggregationSerializationHelper.ReadContainer("percentiles_bucket", ref reader, options); + } + + if (propertyName == "range") + { + return AggregationSerializationHelper.ReadContainer("range", ref reader, options); + } + + if (propertyName == "rate") + { + return AggregationSerializationHelper.ReadContainer("rate", ref reader, options); + } + + if (propertyName == "reverse_nested") + { + return AggregationSerializationHelper.ReadContainer("reverse_nested", ref reader, options); + } + + if (propertyName == "sampler") + { + return AggregationSerializationHelper.ReadContainer("sampler", ref reader, options); + } + + if (propertyName == "scripted_metric") + { + return AggregationSerializationHelper.ReadContainer("scripted_metric", ref reader, options); + } + + if (propertyName == "stats") + { + return AggregationSerializationHelper.ReadContainer("stats", ref reader, options); + } + + if (propertyName == "stats_bucket") + { + return AggregationSerializationHelper.ReadContainer("stats_bucket", ref reader, options); + } + + if (propertyName == "string_stats") + { + return AggregationSerializationHelper.ReadContainer("string_stats", ref reader, options); + } + + if (propertyName == "sum") + { + return AggregationSerializationHelper.ReadContainer("sum", ref reader, options); + } + + if (propertyName == "t_test") + { + return AggregationSerializationHelper.ReadContainer("t_test", ref reader, options); + } + + if (propertyName == "terms") + { + return AggregationSerializationHelper.ReadContainer("terms", ref reader, options); + } + + if (propertyName == "top_hits") + { + return AggregationSerializationHelper.ReadContainer("top_hits", ref reader, options); + } + + if (propertyName == "top_metrics") + { + return AggregationSerializationHelper.ReadContainer("top_metrics", ref reader, options); + } + + if (propertyName == "value_count") + { + return AggregationSerializationHelper.ReadContainer("value_count", ref reader, options); + } + + if (propertyName == "variable_width_histogram") + { + return AggregationSerializationHelper.ReadContainer("variable_width_histogram", ref reader, options); + } + + if (propertyName == "weighted_avg") + { + return AggregationSerializationHelper.ReadContainer("weighted_avg", ref reader, options); + } + + throw new JsonException(); + } + + public override void Write(Utf8JsonWriter writer, Aggregation value, JsonSerializerOptions options) + { + if (value is null) + { + writer.WriteNullValue(); + } + else if (value.SerializeFluent is not null) + { + value.SerializeFluent(writer, options); + } + else if (value.Variant is not null) + { + var type = value.Variant.GetType(); + JsonSerializer.Serialize(writer, value.Variant, type, options); + } + else + { + throw new JsonException("Invalid container cannot be serialised"); + } + } +} + +public sealed partial class AggregationDescriptor : SerializableDescriptor> +{ + internal AggregationDescriptor(Action> configure) => configure.Invoke(this); + public AggregationDescriptor() : base() + { + } + + public AggregationDescriptor AdjacencyMatrix(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("adjacency_matrix", configure)); + } + + public AggregationDescriptor AutoDateHistogram(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("auto_date_histogram", configure)); + } + + public AggregationDescriptor Avg(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("avg", configure)); + } + + public AggregationDescriptor Boxplot(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("boxplot", configure)); + } + + public AggregationDescriptor Cardinality(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("cardinality", configure)); + } + + public AggregationDescriptor Children(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("children", configure)); + } + + public AggregationDescriptor Composite(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("composite", configure)); + } + + public AggregationDescriptor CumulativeCardinality(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("cumulative_cardinality", configure)); + } + + public AggregationDescriptor DateHistogram(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("date_histogram", configure)); + } + + public AggregationDescriptor DateRange(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("date_range", configure)); + } + + public AggregationDescriptor Derivative(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("derivative", configure)); + } + + public AggregationDescriptor ExtendedStats(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("extended_stats", configure)); + } + + public AggregationDescriptor ExtendedStatsBucket(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("extended_stats_bucket", configure)); + } + + public AggregationDescriptor Filters(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("filters", configure)); + } + + public AggregationDescriptor Global(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("global", configure)); + } + + public AggregationDescriptor Histogram(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("histogram", configure)); + } + + public AggregationDescriptor Inference(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("inference", configure)); + } + + public AggregationDescriptor IpRange(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("ip_range", configure)); + } + + public AggregationDescriptor MatrixStats(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("matrix_stats", configure)); + } + + public AggregationDescriptor Max(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("max", configure)); + } + + public AggregationDescriptor MedianAbsoluteDeviation(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("median_absolute_deviation", configure)); + } + + public AggregationDescriptor Min(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("min", configure)); + } + + public AggregationDescriptor Missing(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("missing", configure)); + } + + public AggregationDescriptor MultiTerms(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("multi_terms", configure)); + } + + public AggregationDescriptor Nested(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("nested", configure)); + } + + public AggregationDescriptor Parent(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("parent", configure)); + } + + public AggregationDescriptor PercentilesBucket(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("percentiles_bucket", configure)); + } + + public AggregationDescriptor Range(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("range", configure)); + } + + public AggregationDescriptor Rate(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("rate", configure)); + } + + public AggregationDescriptor ReverseNested(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("reverse_nested", configure)); + } + + public AggregationDescriptor Sampler(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("sampler", configure)); + } + + public AggregationDescriptor ScriptedMetric(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("scripted_metric", configure)); + } + + public AggregationDescriptor Stats(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("stats", configure)); + } + + public AggregationDescriptor StatsBucket(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("stats_bucket", configure)); + } + + public AggregationDescriptor StringStats(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("string_stats", configure)); + } + + public AggregationDescriptor Sum(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("sum", configure)); + } + + public AggregationDescriptor TTest(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("t_test", configure)); + } + + public AggregationDescriptor Terms(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("terms", configure)); + } + + public AggregationDescriptor TopHits(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("top_hits", configure)); + } + + public AggregationDescriptor TopMetrics(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("top_metrics", configure)); + } + + public AggregationDescriptor ValueCount(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("value_count", configure)); + } + + public AggregationDescriptor VariableWidthHistogram(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("variable_width_histogram", configure)); + } + + public AggregationDescriptor WeightedAvg(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("weighted_avg", configure)); + } +} + +public sealed partial class AggregationDescriptor : SerializableDescriptor +{ + internal AggregationDescriptor(Action configure) => configure.Invoke(this); + public AggregationDescriptor() : base() + { + } + + public AggregationDescriptor AdjacencyMatrix(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("adjacency_matrix", configure)); + } + + public AggregationDescriptor AdjacencyMatrix(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("adjacency_matrix", configure)); + } + + public AggregationDescriptor AutoDateHistogram(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("auto_date_histogram", configure)); + } + + public AggregationDescriptor AutoDateHistogram(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("auto_date_histogram", configure)); + } + + public AggregationDescriptor Avg(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("avg", configure)); + } + + public AggregationDescriptor Avg(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("avg", configure)); + } + + public AggregationDescriptor Boxplot(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("boxplot", configure)); + } + + public AggregationDescriptor Boxplot(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("boxplot", configure)); + } + + public AggregationDescriptor Cardinality(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("cardinality", configure)); + } + + public AggregationDescriptor Cardinality(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("cardinality", configure)); + } + + public AggregationDescriptor Children(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("children", configure)); + } + + public AggregationDescriptor Children(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("children", configure)); + } + + public AggregationDescriptor Composite(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("composite", configure)); + } + + public AggregationDescriptor Composite(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("composite", configure)); + } + + public AggregationDescriptor CumulativeCardinality(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("cumulative_cardinality", configure)); + } + + public AggregationDescriptor DateHistogram(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("date_histogram", configure)); + } + + public AggregationDescriptor DateHistogram(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("date_histogram", configure)); + } + + public AggregationDescriptor DateRange(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("date_range", configure)); + } + + public AggregationDescriptor DateRange(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("date_range", configure)); + } + + public AggregationDescriptor Derivative(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("derivative", configure)); + } + + public AggregationDescriptor ExtendedStats(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("extended_stats", configure)); + } + + public AggregationDescriptor ExtendedStats(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("extended_stats", configure)); + } + + public AggregationDescriptor ExtendedStatsBucket(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("extended_stats_bucket", configure)); + } + + public AggregationDescriptor Filters(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("filters", configure)); + } + + public AggregationDescriptor Filters(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("filters", configure)); + } + + public AggregationDescriptor Global(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("global", configure)); + } + + public AggregationDescriptor Global(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("global", configure)); + } + + public AggregationDescriptor Histogram(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("histogram", configure)); + } + + public AggregationDescriptor Histogram(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("histogram", configure)); + } + + public AggregationDescriptor Inference(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("inference", configure)); + } + + public AggregationDescriptor Inference(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("inference", configure)); + } + + public AggregationDescriptor IpRange(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("ip_range", configure)); + } + + public AggregationDescriptor IpRange(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("ip_range", configure)); + } + + public AggregationDescriptor MatrixStats(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("matrix_stats", configure)); + } + + public AggregationDescriptor MatrixStats(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("matrix_stats", configure)); + } + + public AggregationDescriptor Max(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("max", configure)); + } + + public AggregationDescriptor Max(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("max", configure)); + } + + public AggregationDescriptor MedianAbsoluteDeviation(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("median_absolute_deviation", configure)); + } + + public AggregationDescriptor MedianAbsoluteDeviation(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("median_absolute_deviation", configure)); + } + + public AggregationDescriptor Min(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("min", configure)); + } + + public AggregationDescriptor Min(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("min", configure)); + } + + public AggregationDescriptor Missing(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("missing", configure)); + } + + public AggregationDescriptor Missing(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("missing", configure)); + } + + public AggregationDescriptor MultiTerms(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("multi_terms", configure)); + } + + public AggregationDescriptor MultiTerms(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("multi_terms", configure)); + } + + public AggregationDescriptor Nested(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("nested", configure)); + } + + public AggregationDescriptor Nested(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("nested", configure)); + } + + public AggregationDescriptor Parent(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("parent", configure)); + } + + public AggregationDescriptor Parent(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("parent", configure)); + } + + public AggregationDescriptor PercentilesBucket(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("percentiles_bucket", configure)); + } + + public AggregationDescriptor Range(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("range", configure)); + } + + public AggregationDescriptor Range(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("range", configure)); + } + + public AggregationDescriptor Rate(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("rate", configure)); + } + + public AggregationDescriptor Rate(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("rate", configure)); + } + + public AggregationDescriptor ReverseNested(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("reverse_nested", configure)); + } + + public AggregationDescriptor ReverseNested(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("reverse_nested", configure)); + } + + public AggregationDescriptor Sampler(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("sampler", configure)); + } + + public AggregationDescriptor Sampler(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("sampler", configure)); + } + + public AggregationDescriptor ScriptedMetric(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("scripted_metric", configure)); + } + + public AggregationDescriptor ScriptedMetric(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("scripted_metric", configure)); + } + + public AggregationDescriptor Stats(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("stats", configure)); + } + + public AggregationDescriptor Stats(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("stats", configure)); + } + + public AggregationDescriptor StatsBucket(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("stats_bucket", configure)); + } + + public AggregationDescriptor StringStats(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("string_stats", configure)); + } + + public AggregationDescriptor StringStats(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("string_stats", configure)); + } + + public AggregationDescriptor Sum(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("sum", configure)); + } + + public AggregationDescriptor Sum(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("sum", configure)); + } + + public AggregationDescriptor TTest(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("t_test", configure)); + } + + public AggregationDescriptor TTest(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("t_test", configure)); + } + + public AggregationDescriptor Terms(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("terms", configure)); + } + + public AggregationDescriptor Terms(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("terms", configure)); + } + + public AggregationDescriptor TopHits(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("top_hits", configure)); + } + + public AggregationDescriptor TopHits(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("top_hits", configure)); + } + + public AggregationDescriptor TopMetrics(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("top_metrics", configure)); + } + + public AggregationDescriptor TopMetrics(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("top_metrics", configure)); + } + + public AggregationDescriptor ValueCount(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("value_count", configure)); + } + + public AggregationDescriptor ValueCount(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("value_count", configure)); + } + + public AggregationDescriptor VariableWidthHistogram(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("variable_width_histogram", configure)); + } + + public AggregationDescriptor VariableWidthHistogram(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("variable_width_histogram", configure)); + } + + public AggregationDescriptor WeightedAvg(string name, Action configure) + { + return SetContainer(name, Aggregation.CreateWithAction("weighted_avg", configure)); + } + + public AggregationDescriptor WeightedAvg(string name, Action> configure) + { + return SetContainer(name, Aggregation.CreateWithAction("weighted_avg", configure)); + } +} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregationContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregationContainer.g.cs deleted file mode 100644 index ce169c41a81..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregationContainer.g.cs +++ /dev/null @@ -1,921 +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. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch.Aggregations; -[JsonConverter(typeof(AggregationContainerConverter))] -public sealed partial class AggregationContainer -{ - internal AggregationContainer(IAggregation variant) => Variant = variant ?? throw new ArgumentNullException(nameof(variant)); - internal IAggregation Variant { get; } -} - -internal sealed class AggregationContainerConverter : JsonConverter -{ - public override AggregationContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - var readerCopy = reader; - readerCopy.Read(); - if (readerCopy.TokenType != JsonTokenType.PropertyName) - { - throw new JsonException(); - } - - var propertyName = readerCopy.GetString(); - if (propertyName == "adjacency_matrix") - { - return AggregationContainerSerializationHelper.ReadContainer("adjacency_matrix", ref reader, options); - } - - if (propertyName == "auto_date_histogram") - { - return AggregationContainerSerializationHelper.ReadContainer("auto_date_histogram", ref reader, options); - } - - if (propertyName == "avg") - { - return AggregationContainerSerializationHelper.ReadContainer("avg", ref reader, options); - } - - if (propertyName == "boxplot") - { - return AggregationContainerSerializationHelper.ReadContainer("boxplot", ref reader, options); - } - - if (propertyName == "cardinality") - { - return AggregationContainerSerializationHelper.ReadContainer("cardinality", ref reader, options); - } - - if (propertyName == "children") - { - return AggregationContainerSerializationHelper.ReadContainer("children", ref reader, options); - } - - if (propertyName == "composite") - { - return AggregationContainerSerializationHelper.ReadContainer("composite", ref reader, options); - } - - if (propertyName == "cumulative_cardinality") - { - return AggregationContainerSerializationHelper.ReadContainer("cumulative_cardinality", ref reader, options); - } - - if (propertyName == "date_histogram") - { - return AggregationContainerSerializationHelper.ReadContainer("date_histogram", ref reader, options); - } - - if (propertyName == "date_range") - { - return AggregationContainerSerializationHelper.ReadContainer("date_range", ref reader, options); - } - - if (propertyName == "derivative") - { - return AggregationContainerSerializationHelper.ReadContainer("derivative", ref reader, options); - } - - if (propertyName == "extended_stats") - { - return AggregationContainerSerializationHelper.ReadContainer("extended_stats", ref reader, options); - } - - if (propertyName == "extended_stats_bucket") - { - return AggregationContainerSerializationHelper.ReadContainer("extended_stats_bucket", ref reader, options); - } - - if (propertyName == "filters") - { - return AggregationContainerSerializationHelper.ReadContainer("filters", ref reader, options); - } - - if (propertyName == "global") - { - return AggregationContainerSerializationHelper.ReadContainer("global", ref reader, options); - } - - if (propertyName == "histogram") - { - return AggregationContainerSerializationHelper.ReadContainer("histogram", ref reader, options); - } - - if (propertyName == "inference") - { - return AggregationContainerSerializationHelper.ReadContainer("inference", ref reader, options); - } - - if (propertyName == "ip_range") - { - return AggregationContainerSerializationHelper.ReadContainer("ip_range", ref reader, options); - } - - if (propertyName == "matrix_stats") - { - return AggregationContainerSerializationHelper.ReadContainer("matrix_stats", ref reader, options); - } - - if (propertyName == "max") - { - return AggregationContainerSerializationHelper.ReadContainer("max", ref reader, options); - } - - if (propertyName == "median_absolute_deviation") - { - return AggregationContainerSerializationHelper.ReadContainer("median_absolute_deviation", ref reader, options); - } - - if (propertyName == "min") - { - return AggregationContainerSerializationHelper.ReadContainer("min", ref reader, options); - } - - if (propertyName == "missing") - { - return AggregationContainerSerializationHelper.ReadContainer("missing", ref reader, options); - } - - if (propertyName == "multi_terms") - { - return AggregationContainerSerializationHelper.ReadContainer("multi_terms", ref reader, options); - } - - if (propertyName == "nested") - { - return AggregationContainerSerializationHelper.ReadContainer("nested", ref reader, options); - } - - if (propertyName == "parent") - { - return AggregationContainerSerializationHelper.ReadContainer("parent", ref reader, options); - } - - if (propertyName == "percentiles_bucket") - { - return AggregationContainerSerializationHelper.ReadContainer("percentiles_bucket", ref reader, options); - } - - if (propertyName == "range") - { - return AggregationContainerSerializationHelper.ReadContainer("range", ref reader, options); - } - - if (propertyName == "rate") - { - return AggregationContainerSerializationHelper.ReadContainer("rate", ref reader, options); - } - - if (propertyName == "reverse_nested") - { - return AggregationContainerSerializationHelper.ReadContainer("reverse_nested", ref reader, options); - } - - if (propertyName == "sampler") - { - return AggregationContainerSerializationHelper.ReadContainer("sampler", ref reader, options); - } - - if (propertyName == "scripted_metric") - { - return AggregationContainerSerializationHelper.ReadContainer("scripted_metric", ref reader, options); - } - - if (propertyName == "stats") - { - return AggregationContainerSerializationHelper.ReadContainer("stats", ref reader, options); - } - - if (propertyName == "stats_bucket") - { - return AggregationContainerSerializationHelper.ReadContainer("stats_bucket", ref reader, options); - } - - if (propertyName == "string_stats") - { - return AggregationContainerSerializationHelper.ReadContainer("string_stats", ref reader, options); - } - - if (propertyName == "sum") - { - return AggregationContainerSerializationHelper.ReadContainer("sum", ref reader, options); - } - - if (propertyName == "t_test") - { - return AggregationContainerSerializationHelper.ReadContainer("t_test", ref reader, options); - } - - if (propertyName == "terms") - { - return AggregationContainerSerializationHelper.ReadContainer("terms", ref reader, options); - } - - if (propertyName == "top_hits") - { - return AggregationContainerSerializationHelper.ReadContainer("top_hits", ref reader, options); - } - - if (propertyName == "top_metrics") - { - return AggregationContainerSerializationHelper.ReadContainer("top_metrics", ref reader, options); - } - - if (propertyName == "value_count") - { - return AggregationContainerSerializationHelper.ReadContainer("value_count", ref reader, options); - } - - if (propertyName == "variable_width_histogram") - { - return AggregationContainerSerializationHelper.ReadContainer("variable_width_histogram", ref reader, options); - } - - if (propertyName == "weighted_avg") - { - return AggregationContainerSerializationHelper.ReadContainer("weighted_avg", ref reader, options); - } - - throw new JsonException(); - } - - public override void Write(Utf8JsonWriter writer, AggregationContainer value, JsonSerializerOptions options) - { - if (value is null) - { - writer.WriteNullValue(); - } - else if (value.SerializeFluent is not null) - { - value.SerializeFluent(writer, options); - } - else if (value.Variant is not null) - { - var type = value.Variant.GetType(); - JsonSerializer.Serialize(writer, value.Variant, type, options); - } - else - { - throw new JsonException("Invalid container cannot be serialised"); - } - } -} - -public sealed partial class AggregationContainerDescriptor : SerializableDescriptor> -{ - internal AggregationContainerDescriptor(Action> configure) => configure.Invoke(this); - public AggregationContainerDescriptor() : base() - { - } - - public AggregationContainerDescriptor AdjacencyMatrix(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("adjacency_matrix", configure)); - } - - public AggregationContainerDescriptor AutoDateHistogram(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("auto_date_histogram", configure)); - } - - public AggregationContainerDescriptor Avg(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("avg", configure)); - } - - public AggregationContainerDescriptor Boxplot(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("boxplot", configure)); - } - - public AggregationContainerDescriptor Cardinality(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("cardinality", configure)); - } - - public AggregationContainerDescriptor Children(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("children", configure)); - } - - public AggregationContainerDescriptor Composite(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("composite", configure)); - } - - public AggregationContainerDescriptor CumulativeCardinality(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("cumulative_cardinality", configure)); - } - - public AggregationContainerDescriptor DateHistogram(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("date_histogram", configure)); - } - - public AggregationContainerDescriptor DateRange(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("date_range", configure)); - } - - public AggregationContainerDescriptor Derivative(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("derivative", configure)); - } - - public AggregationContainerDescriptor ExtendedStats(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("extended_stats", configure)); - } - - public AggregationContainerDescriptor ExtendedStatsBucket(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("extended_stats_bucket", configure)); - } - - public AggregationContainerDescriptor Filters(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("filters", configure)); - } - - public AggregationContainerDescriptor Global(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("global", configure)); - } - - public AggregationContainerDescriptor Histogram(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("histogram", configure)); - } - - public AggregationContainerDescriptor Inference(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("inference", configure)); - } - - public AggregationContainerDescriptor IpRange(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("ip_range", configure)); - } - - public AggregationContainerDescriptor MatrixStats(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("matrix_stats", configure)); - } - - public AggregationContainerDescriptor Max(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("max", configure)); - } - - public AggregationContainerDescriptor MedianAbsoluteDeviation(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("median_absolute_deviation", configure)); - } - - public AggregationContainerDescriptor Min(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("min", configure)); - } - - public AggregationContainerDescriptor Missing(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("missing", configure)); - } - - public AggregationContainerDescriptor MultiTerms(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("multi_terms", configure)); - } - - public AggregationContainerDescriptor Nested(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("nested", configure)); - } - - public AggregationContainerDescriptor Parent(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("parent", configure)); - } - - public AggregationContainerDescriptor PercentilesBucket(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("percentiles_bucket", configure)); - } - - public AggregationContainerDescriptor Range(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("range", configure)); - } - - public AggregationContainerDescriptor Rate(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("rate", configure)); - } - - public AggregationContainerDescriptor ReverseNested(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("reverse_nested", configure)); - } - - public AggregationContainerDescriptor Sampler(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("sampler", configure)); - } - - public AggregationContainerDescriptor ScriptedMetric(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("scripted_metric", configure)); - } - - public AggregationContainerDescriptor Stats(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("stats", configure)); - } - - public AggregationContainerDescriptor StatsBucket(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("stats_bucket", configure)); - } - - public AggregationContainerDescriptor StringStats(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("string_stats", configure)); - } - - public AggregationContainerDescriptor Sum(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("sum", configure)); - } - - public AggregationContainerDescriptor TTest(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("t_test", configure)); - } - - public AggregationContainerDescriptor Terms(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("terms", configure)); - } - - public AggregationContainerDescriptor TopHits(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("top_hits", configure)); - } - - public AggregationContainerDescriptor TopMetrics(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("top_metrics", configure)); - } - - public AggregationContainerDescriptor ValueCount(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("value_count", configure)); - } - - public AggregationContainerDescriptor VariableWidthHistogram(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("variable_width_histogram", configure)); - } - - public AggregationContainerDescriptor WeightedAvg(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("weighted_avg", configure)); - } -} - -public sealed partial class AggregationContainerDescriptor : SerializableDescriptor -{ - internal AggregationContainerDescriptor(Action configure) => configure.Invoke(this); - public AggregationContainerDescriptor() : base() - { - } - - public AggregationContainerDescriptor AdjacencyMatrix(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("adjacency_matrix", configure)); - } - - public AggregationContainerDescriptor AdjacencyMatrix(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("adjacency_matrix", configure)); - } - - public AggregationContainerDescriptor AutoDateHistogram(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("auto_date_histogram", configure)); - } - - public AggregationContainerDescriptor AutoDateHistogram(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("auto_date_histogram", configure)); - } - - public AggregationContainerDescriptor Avg(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("avg", configure)); - } - - public AggregationContainerDescriptor Avg(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("avg", configure)); - } - - public AggregationContainerDescriptor Boxplot(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("boxplot", configure)); - } - - public AggregationContainerDescriptor Boxplot(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("boxplot", configure)); - } - - public AggregationContainerDescriptor Cardinality(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("cardinality", configure)); - } - - public AggregationContainerDescriptor Cardinality(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("cardinality", configure)); - } - - public AggregationContainerDescriptor Children(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("children", configure)); - } - - public AggregationContainerDescriptor Children(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("children", configure)); - } - - public AggregationContainerDescriptor Composite(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("composite", configure)); - } - - public AggregationContainerDescriptor Composite(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("composite", configure)); - } - - public AggregationContainerDescriptor CumulativeCardinality(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("cumulative_cardinality", configure)); - } - - public AggregationContainerDescriptor DateHistogram(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("date_histogram", configure)); - } - - public AggregationContainerDescriptor DateHistogram(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("date_histogram", configure)); - } - - public AggregationContainerDescriptor DateRange(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("date_range", configure)); - } - - public AggregationContainerDescriptor DateRange(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("date_range", configure)); - } - - public AggregationContainerDescriptor Derivative(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("derivative", configure)); - } - - public AggregationContainerDescriptor ExtendedStats(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("extended_stats", configure)); - } - - public AggregationContainerDescriptor ExtendedStats(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("extended_stats", configure)); - } - - public AggregationContainerDescriptor ExtendedStatsBucket(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("extended_stats_bucket", configure)); - } - - public AggregationContainerDescriptor Filters(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("filters", configure)); - } - - public AggregationContainerDescriptor Filters(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("filters", configure)); - } - - public AggregationContainerDescriptor Global(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("global", configure)); - } - - public AggregationContainerDescriptor Global(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("global", configure)); - } - - public AggregationContainerDescriptor Histogram(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("histogram", configure)); - } - - public AggregationContainerDescriptor Histogram(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("histogram", configure)); - } - - public AggregationContainerDescriptor Inference(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("inference", configure)); - } - - public AggregationContainerDescriptor Inference(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("inference", configure)); - } - - public AggregationContainerDescriptor IpRange(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("ip_range", configure)); - } - - public AggregationContainerDescriptor IpRange(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("ip_range", configure)); - } - - public AggregationContainerDescriptor MatrixStats(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("matrix_stats", configure)); - } - - public AggregationContainerDescriptor MatrixStats(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("matrix_stats", configure)); - } - - public AggregationContainerDescriptor Max(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("max", configure)); - } - - public AggregationContainerDescriptor Max(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("max", configure)); - } - - public AggregationContainerDescriptor MedianAbsoluteDeviation(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("median_absolute_deviation", configure)); - } - - public AggregationContainerDescriptor MedianAbsoluteDeviation(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("median_absolute_deviation", configure)); - } - - public AggregationContainerDescriptor Min(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("min", configure)); - } - - public AggregationContainerDescriptor Min(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("min", configure)); - } - - public AggregationContainerDescriptor Missing(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("missing", configure)); - } - - public AggregationContainerDescriptor Missing(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("missing", configure)); - } - - public AggregationContainerDescriptor MultiTerms(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("multi_terms", configure)); - } - - public AggregationContainerDescriptor MultiTerms(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("multi_terms", configure)); - } - - public AggregationContainerDescriptor Nested(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("nested", configure)); - } - - public AggregationContainerDescriptor Nested(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("nested", configure)); - } - - public AggregationContainerDescriptor Parent(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("parent", configure)); - } - - public AggregationContainerDescriptor Parent(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("parent", configure)); - } - - public AggregationContainerDescriptor PercentilesBucket(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("percentiles_bucket", configure)); - } - - public AggregationContainerDescriptor Range(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("range", configure)); - } - - public AggregationContainerDescriptor Range(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("range", configure)); - } - - public AggregationContainerDescriptor Rate(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("rate", configure)); - } - - public AggregationContainerDescriptor Rate(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("rate", configure)); - } - - public AggregationContainerDescriptor ReverseNested(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("reverse_nested", configure)); - } - - public AggregationContainerDescriptor ReverseNested(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("reverse_nested", configure)); - } - - public AggregationContainerDescriptor Sampler(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("sampler", configure)); - } - - public AggregationContainerDescriptor Sampler(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("sampler", configure)); - } - - public AggregationContainerDescriptor ScriptedMetric(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("scripted_metric", configure)); - } - - public AggregationContainerDescriptor ScriptedMetric(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("scripted_metric", configure)); - } - - public AggregationContainerDescriptor Stats(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("stats", configure)); - } - - public AggregationContainerDescriptor Stats(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("stats", configure)); - } - - public AggregationContainerDescriptor StatsBucket(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("stats_bucket", configure)); - } - - public AggregationContainerDescriptor StringStats(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("string_stats", configure)); - } - - public AggregationContainerDescriptor StringStats(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("string_stats", configure)); - } - - public AggregationContainerDescriptor Sum(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("sum", configure)); - } - - public AggregationContainerDescriptor Sum(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("sum", configure)); - } - - public AggregationContainerDescriptor TTest(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("t_test", configure)); - } - - public AggregationContainerDescriptor TTest(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("t_test", configure)); - } - - public AggregationContainerDescriptor Terms(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("terms", configure)); - } - - public AggregationContainerDescriptor Terms(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("terms", configure)); - } - - public AggregationContainerDescriptor TopHits(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("top_hits", configure)); - } - - public AggregationContainerDescriptor TopHits(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("top_hits", configure)); - } - - public AggregationContainerDescriptor TopMetrics(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("top_metrics", configure)); - } - - public AggregationContainerDescriptor TopMetrics(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("top_metrics", configure)); - } - - public AggregationContainerDescriptor ValueCount(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("value_count", configure)); - } - - public AggregationContainerDescriptor ValueCount(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("value_count", configure)); - } - - public AggregationContainerDescriptor VariableWidthHistogram(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("variable_width_histogram", configure)); - } - - public AggregationContainerDescriptor VariableWidthHistogram(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("variable_width_histogram", configure)); - } - - public AggregationContainerDescriptor WeightedAvg(string name, Action configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("weighted_avg", configure)); - } - - public AggregationContainerDescriptor WeightedAvg(string name, Action> configure) - { - return SetContainer(name, AggregationContainer.CreateWithAction("weighted_avg", configure)); - } -} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs index bc04e517ed3..6392cce89a1 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs @@ -258,7 +258,7 @@ public override void Write(Utf8JsonWriter writer, AutoDateHistogramAggregation v } [JsonConverter(typeof(AutoDateHistogramAggregationConverter))] -public sealed partial class AutoDateHistogramAggregation : Aggregation +public sealed partial class AutoDateHistogramAggregation : SearchAggregation { public AutoDateHistogramAggregation(string name) => Name = name; internal AutoDateHistogramAggregation() @@ -299,9 +299,9 @@ public AutoDateHistogramAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private int? BucketsValue { get; set; } @@ -331,7 +331,7 @@ public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Cl return Self; } - public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -339,7 +339,7 @@ public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Cl return Self; } - public AutoDateHistogramAggregationDescriptor Aggregations(Action> configure) + public AutoDateHistogramAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -487,7 +487,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -508,9 +508,9 @@ public AutoDateHistogramAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private int? BucketsValue { get; set; } @@ -540,7 +540,7 @@ public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elast return Self; } - public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -548,7 +548,7 @@ public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elast return Self; } - public AutoDateHistogramAggregationDescriptor Aggregations(Action configure) + public AutoDateHistogramAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -702,7 +702,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregation.g.cs index f520d37d0ba..c86e24da7b4 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, AverageAggregation value, Json } [JsonConverter(typeof(AverageAggregationConverter))] -public sealed partial class AverageAggregation : Aggregation +public sealed partial class AverageAggregation : SearchAggregation { public AverageAggregation(string name, Field field) : this(name) => Field = field; public AverageAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregation.g.cs index 5ff4e3d5973..600e10b40bb 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, BoxplotAggregation value, Json } [JsonConverter(typeof(BoxplotAggregationConverter))] -public sealed partial class BoxplotAggregation : Aggregation +public sealed partial class BoxplotAggregation : SearchAggregation { public BoxplotAggregation(string name, Field field) : this(name) => Field = field; public BoxplotAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregation.g.cs index f02f60c1043..9ee65f11c7f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregation.g.cs @@ -187,7 +187,7 @@ public override void Write(Utf8JsonWriter writer, CardinalityAggregation value, } [JsonConverter(typeof(CardinalityAggregationConverter))] -public sealed partial class CardinalityAggregation : Aggregation +public sealed partial class CardinalityAggregation : SearchAggregation { public CardinalityAggregation(string name, Field field) : this(name) => Field = field; public CardinalityAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregation.g.cs index 2e0079f53df..3c6ba4ffd12 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregation.g.cs @@ -114,7 +114,7 @@ public override void Write(Utf8JsonWriter writer, ChildrenAggregation value, Jso } [JsonConverter(typeof(ChildrenAggregationConverter))] -public sealed partial class ChildrenAggregation : Aggregation +public sealed partial class ChildrenAggregation : SearchAggregation { public ChildrenAggregation(string name) => Name = name; internal ChildrenAggregation() @@ -139,9 +139,9 @@ public ChildrenAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -155,7 +155,7 @@ public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Ela return Self; } - public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -163,7 +163,7 @@ public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Ela return Self; } - public ChildrenAggregationDescriptor Aggregations(Action> configure) + public ChildrenAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -209,7 +209,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -230,9 +230,9 @@ public ChildrenAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -246,7 +246,7 @@ public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch. return Self; } - public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -254,7 +254,7 @@ public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch. return Self; } - public ChildrenAggregationDescriptor Aggregations(Action configure) + public ChildrenAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -300,7 +300,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregation.g.cs index 589147c71c9..a412bd9f384 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregation.g.cs @@ -150,7 +150,7 @@ public override void Write(Utf8JsonWriter writer, CompositeAggregation value, Js } [JsonConverter(typeof(CompositeAggregationConverter))] -public sealed partial class CompositeAggregation : Aggregation +public sealed partial class CompositeAggregation : SearchAggregation { public CompositeAggregation(string name) => Name = name; internal CompositeAggregation() @@ -179,9 +179,9 @@ public CompositeAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Dictionary? AfterValue { get; set; } @@ -199,7 +199,7 @@ public CompositeAggregationDescriptor Aggregations(Elastic.Clients.El return Self; } - public CompositeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public CompositeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -207,7 +207,7 @@ public CompositeAggregationDescriptor Aggregations(Elastic.Clients.El return Self; } - public CompositeAggregationDescriptor Aggregations(Action> configure) + public CompositeAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -277,7 +277,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -298,9 +298,9 @@ public CompositeAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Dictionary? AfterValue { get; set; } @@ -318,7 +318,7 @@ public CompositeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch return Self; } - public CompositeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public CompositeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -326,7 +326,7 @@ public CompositeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch return Self; } - public CompositeAggregationDescriptor Aggregations(Action configure) + public CompositeAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -396,7 +396,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregation.g.cs index 12400227642..fe6b736e10f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregation.g.cs @@ -115,7 +115,7 @@ public override void Write(Utf8JsonWriter writer, CumulativeCardinalityAggregati } [JsonConverter(typeof(CumulativeCardinalityAggregationConverter))] -public sealed partial class CumulativeCardinalityAggregation : Aggregation +public sealed partial class CumulativeCardinalityAggregation : SearchAggregation { public CumulativeCardinalityAggregation(string name) => Name = name; internal CumulativeCardinalityAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs index 3d0dd035ff0..82c91384e9d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs @@ -294,7 +294,7 @@ public override void Write(Utf8JsonWriter writer, DateHistogramAggregation value } [JsonConverter(typeof(DateHistogramAggregationConverter))] -public sealed partial class DateHistogramAggregation : Aggregation +public sealed partial class DateHistogramAggregation : SearchAggregation { public DateHistogramAggregation(string name) => Name = name; internal DateHistogramAggregation() @@ -340,9 +340,9 @@ public DateHistogramAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? CalendarIntervalValue { get; set; } @@ -376,7 +376,7 @@ public DateHistogramAggregationDescriptor Aggregations(Elastic.Client return Self; } - public DateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public DateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -384,7 +384,7 @@ public DateHistogramAggregationDescriptor Aggregations(Elastic.Client return Self; } - public DateHistogramAggregationDescriptor Aggregations(Action> configure) + public DateHistogramAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -556,7 +556,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -577,9 +577,9 @@ public DateHistogramAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? CalendarIntervalValue { get; set; } @@ -613,7 +613,7 @@ public DateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticse return Self; } - public DateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public DateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -621,7 +621,7 @@ public DateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticse return Self; } - public DateHistogramAggregationDescriptor Aggregations(Action configure) + public DateHistogramAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -799,7 +799,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs index 31bb4155cb7..279ee74d768 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs @@ -186,7 +186,7 @@ public override void Write(Utf8JsonWriter writer, DateRangeAggregation value, Js } [JsonConverter(typeof(DateRangeAggregationConverter))] -public sealed partial class DateRangeAggregation : Aggregation +public sealed partial class DateRangeAggregation : SearchAggregation { public DateRangeAggregation(string name) => Name = name; internal DateRangeAggregation() @@ -219,9 +219,9 @@ public DateRangeAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -249,7 +249,7 @@ public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.El return Self; } - public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -257,7 +257,7 @@ public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.El return Self; } - public DateRangeAggregationDescriptor Aggregations(Action> configure) + public DateRangeAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -412,7 +412,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -433,9 +433,9 @@ public DateRangeAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -463,7 +463,7 @@ public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch return Self; } - public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -471,7 +471,7 @@ public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch return Self; } - public DateRangeAggregationDescriptor Aggregations(Action configure) + public DateRangeAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -632,7 +632,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregation.g.cs index f497030f55f..185be5319cd 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregation.g.cs @@ -115,7 +115,7 @@ public override void Write(Utf8JsonWriter writer, DerivativeAggregation value, J } [JsonConverter(typeof(DerivativeAggregationConverter))] -public sealed partial class DerivativeAggregation : Aggregation +public sealed partial class DerivativeAggregation : SearchAggregation { public DerivativeAggregation(string name) => Name = name; internal DerivativeAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregation.g.cs index daddf68244a..d11d0950483 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregation.g.cs @@ -169,7 +169,7 @@ public override void Write(Utf8JsonWriter writer, ExtendedStatsAggregation value } [JsonConverter(typeof(ExtendedStatsAggregationConverter))] -public sealed partial class ExtendedStatsAggregation : Aggregation +public sealed partial class ExtendedStatsAggregation : SearchAggregation { public ExtendedStatsAggregation(string name, Field field) : this(name) => Field = field; public ExtendedStatsAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregation.g.cs index 937639802ad..59f1f61aae9 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregation.g.cs @@ -133,7 +133,7 @@ public override void Write(Utf8JsonWriter writer, ExtendedStatsBucketAggregation } [JsonConverter(typeof(ExtendedStatsBucketAggregationConverter))] -public sealed partial class ExtendedStatsBucketAggregation : Aggregation +public sealed partial class ExtendedStatsBucketAggregation : SearchAggregation { public ExtendedStatsBucketAggregation(string name) => Name = name; internal ExtendedStatsBucketAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregation.g.cs index 7945b5dedff..9727295e2eb 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregation.g.cs @@ -43,7 +43,7 @@ public override FiltersAggregation Read(ref Utf8JsonReader reader, Type typeToCo if (reader.ValueTextEquals("filters")) { reader.Read(); - var value = JsonSerializer.Deserialize?>(ref reader, options); + var value = JsonSerializer.Deserialize?>(ref reader, options); if (value is not null) { agg.Filters = value; @@ -150,7 +150,7 @@ public override void Write(Utf8JsonWriter writer, FiltersAggregation value, Json } [JsonConverter(typeof(FiltersAggregationConverter))] -public sealed partial class FiltersAggregation : Aggregation +public sealed partial class FiltersAggregation : SearchAggregation { public FiltersAggregation(string name) => Name = name; internal FiltersAggregation() @@ -159,7 +159,7 @@ internal FiltersAggregation() public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; } - public Elastic.Clients.Elasticsearch.Aggregations.Buckets? Filters { get; set; } + public Elastic.Clients.Elasticsearch.Aggregations.Buckets? Filters { get; set; } public Dictionary? Meta { get; set; } @@ -179,11 +179,11 @@ public FiltersAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.Buckets? FiltersValue { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.Buckets? FiltersValue { get; set; } private Dictionary? MetaValue { get; set; } @@ -199,7 +199,7 @@ public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elas return Self; } - public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -207,7 +207,7 @@ public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elas return Self; } - public FiltersAggregationDescriptor Aggregations(Action> configure) + public FiltersAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -215,7 +215,7 @@ public FiltersAggregationDescriptor Aggregations(Action Filters(Elastic.Clients.Elasticsearch.Aggregations.Buckets? filters) + public FiltersAggregationDescriptor Filters(Elastic.Clients.Elasticsearch.Aggregations.Buckets? filters) { FiltersValue = filters; return Self; @@ -277,7 +277,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -298,11 +298,11 @@ public FiltersAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.Buckets? FiltersValue { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.Buckets? FiltersValue { get; set; } private Dictionary? MetaValue { get; set; } @@ -318,7 +318,7 @@ public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.A return Self; } - public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -326,7 +326,7 @@ public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.A return Self; } - public FiltersAggregationDescriptor Aggregations(Action configure) + public FiltersAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -334,7 +334,7 @@ public FiltersAggregationDescriptor Aggregations(Action? filters) + public FiltersAggregationDescriptor Filters(Elastic.Clients.Elasticsearch.Aggregations.Buckets? filters) { FiltersValue = filters; return Self; @@ -396,7 +396,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregation.g.cs index e8e7244b7ee..bc19b47b518 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregation.g.cs @@ -97,7 +97,7 @@ public override void Write(Utf8JsonWriter writer, GlobalAggregation value, JsonS } [JsonConverter(typeof(GlobalAggregationConverter))] -public sealed partial class GlobalAggregation : Aggregation +public sealed partial class GlobalAggregation : SearchAggregation { public GlobalAggregation(string name) => Name = name; internal GlobalAggregation() @@ -120,9 +120,9 @@ public GlobalAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -134,7 +134,7 @@ public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elast return Self; } - public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -142,7 +142,7 @@ public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elast return Self; } - public GlobalAggregationDescriptor Aggregations(Action> configure) + public GlobalAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -176,7 +176,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -197,9 +197,9 @@ public GlobalAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -211,7 +211,7 @@ public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Ag return Self; } - public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -219,7 +219,7 @@ public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Ag return Self; } - public GlobalAggregationDescriptor Aggregations(Action configure) + public GlobalAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -253,7 +253,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs index 12b4a7e3719..8f0612e30b5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs @@ -240,7 +240,7 @@ public override void Write(Utf8JsonWriter writer, HistogramAggregation value, Js } [JsonConverter(typeof(HistogramAggregationConverter))] -public sealed partial class HistogramAggregation : Aggregation +public sealed partial class HistogramAggregation : SearchAggregation { public HistogramAggregation(string name) => Name = name; internal HistogramAggregation() @@ -280,9 +280,9 @@ public HistogramAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -310,7 +310,7 @@ public HistogramAggregationDescriptor Aggregations(Elastic.Clients.El return Self; } - public HistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public HistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -318,7 +318,7 @@ public HistogramAggregationDescriptor Aggregations(Elastic.Clients.El return Self; } - public HistogramAggregationDescriptor Aggregations(Action> configure) + public HistogramAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -454,7 +454,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -475,9 +475,9 @@ public HistogramAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -505,7 +505,7 @@ public HistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch return Self; } - public HistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public HistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -513,7 +513,7 @@ public HistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch return Self; } - public HistogramAggregationDescriptor Aggregations(Action configure) + public HistogramAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -655,7 +655,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregation.g.cs index e4ebff3780c..beb5815e672 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregation.g.cs @@ -67,7 +67,7 @@ public override InferenceAggregation Read(ref Utf8JsonReader reader, Type typeTo if (reader.ValueTextEquals("inference_config")) { reader.Read(); - var value = JsonSerializer.Deserialize(ref reader, options); + var value = JsonSerializer.Deserialize(ref reader, options); if (value is not null) { agg.InferenceConfig = value; @@ -147,7 +147,7 @@ public override void Write(Utf8JsonWriter writer, InferenceAggregation value, Js } [JsonConverter(typeof(InferenceAggregationConverter))] -public sealed partial class InferenceAggregation : Aggregation +public sealed partial class InferenceAggregation : SearchAggregation { public InferenceAggregation(string name) => Name = name; internal InferenceAggregation() @@ -158,7 +158,7 @@ internal InferenceAggregation() public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; } - public Elastic.Clients.Elasticsearch.Aggregations.InferenceConfigContainer? InferenceConfig { get; set; } + public Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? InferenceConfig { get; set; } public Dictionary? Meta { get; set; } @@ -174,11 +174,11 @@ public InferenceAggregationDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.Aggregations.InferenceConfigContainer? InferenceConfigValue { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? InferenceConfigValue { get; set; } - private InferenceConfigContainerDescriptor InferenceConfigDescriptor { get; set; } + private InferenceConfigDescriptor InferenceConfigDescriptor { get; set; } - private Action> InferenceConfigDescriptorAction { get; set; } + private Action> InferenceConfigDescriptorAction { get; set; } private string? FormatValue { get; set; } @@ -188,7 +188,7 @@ public InferenceAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Name ModelIdValue { get; set; } - public InferenceAggregationDescriptor InferenceConfig(Elastic.Clients.Elasticsearch.Aggregations.InferenceConfigContainer? inferenceConfig) + public InferenceAggregationDescriptor InferenceConfig(Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? inferenceConfig) { InferenceConfigDescriptor = null; InferenceConfigDescriptorAction = null; @@ -196,7 +196,7 @@ public InferenceAggregationDescriptor InferenceConfig(Elastic.Clients return Self; } - public InferenceAggregationDescriptor InferenceConfig(InferenceConfigContainerDescriptor descriptor) + public InferenceAggregationDescriptor InferenceConfig(InferenceConfigDescriptor descriptor) { InferenceConfigValue = null; InferenceConfigDescriptorAction = null; @@ -204,7 +204,7 @@ public InferenceAggregationDescriptor InferenceConfig(InferenceConfig return Self; } - public InferenceAggregationDescriptor InferenceConfig(Action> configure) + public InferenceAggregationDescriptor InferenceConfig(Action> configure) { InferenceConfigValue = null; InferenceConfigDescriptor = null; @@ -249,7 +249,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (InferenceConfigDescriptorAction is not null) { writer.WritePropertyName("inference_config"); - JsonSerializer.Serialize(writer, new InferenceConfigContainerDescriptor(InferenceConfigDescriptorAction), options); + JsonSerializer.Serialize(writer, new InferenceConfigDescriptor(InferenceConfigDescriptorAction), options); } else if (InferenceConfigValue is not null) { @@ -289,11 +289,11 @@ public InferenceAggregationDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.Aggregations.InferenceConfigContainer? InferenceConfigValue { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? InferenceConfigValue { get; set; } - private InferenceConfigContainerDescriptor InferenceConfigDescriptor { get; set; } + private InferenceConfigDescriptor InferenceConfigDescriptor { get; set; } - private Action InferenceConfigDescriptorAction { get; set; } + private Action InferenceConfigDescriptorAction { get; set; } private string? FormatValue { get; set; } @@ -303,7 +303,7 @@ public InferenceAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Name ModelIdValue { get; set; } - public InferenceAggregationDescriptor InferenceConfig(Elastic.Clients.Elasticsearch.Aggregations.InferenceConfigContainer? inferenceConfig) + public InferenceAggregationDescriptor InferenceConfig(Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? inferenceConfig) { InferenceConfigDescriptor = null; InferenceConfigDescriptorAction = null; @@ -311,7 +311,7 @@ public InferenceAggregationDescriptor InferenceConfig(Elastic.Clients.Elasticsea return Self; } - public InferenceAggregationDescriptor InferenceConfig(InferenceConfigContainerDescriptor descriptor) + public InferenceAggregationDescriptor InferenceConfig(InferenceConfigDescriptor descriptor) { InferenceConfigValue = null; InferenceConfigDescriptorAction = null; @@ -319,7 +319,7 @@ public InferenceAggregationDescriptor InferenceConfig(InferenceConfigContainerDe return Self; } - public InferenceAggregationDescriptor InferenceConfig(Action configure) + public InferenceAggregationDescriptor InferenceConfig(Action configure) { InferenceConfigValue = null; InferenceConfigDescriptor = null; @@ -364,7 +364,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (InferenceConfigDescriptorAction is not null) { writer.WritePropertyName("inference_config"); - JsonSerializer.Serialize(writer, new InferenceConfigContainerDescriptor(InferenceConfigDescriptorAction), options); + JsonSerializer.Serialize(writer, new InferenceConfigDescriptor(InferenceConfigDescriptorAction), options); } else if (InferenceConfigValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs similarity index 60% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs index 8221ec5e71a..e5397bb818d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs @@ -25,10 +25,10 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Aggregations; -[JsonConverter(typeof(InferenceConfigContainerConverter))] -public sealed partial class InferenceConfigContainer +[JsonConverter(typeof(InferenceConfigConverter))] +public sealed partial class InferenceConfig { - internal InferenceConfigContainer(string variantName, object variant) + internal InferenceConfig(string variantName, object variant) { if (variantName is null) throw new ArgumentNullException(nameof(variantName)); @@ -44,13 +44,13 @@ internal InferenceConfigContainer(string variantName, object variant) internal string VariantName { get; } - public static InferenceConfigContainer Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigContainer("classification", classificationInferenceOptions); - public static InferenceConfigContainer Regression(Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions regressionInferenceOptions) => new InferenceConfigContainer("regression", regressionInferenceOptions); + public static InferenceConfig Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfig("classification", classificationInferenceOptions); + public static InferenceConfig Regression(Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions regressionInferenceOptions) => new InferenceConfig("regression", regressionInferenceOptions); } -internal sealed class InferenceConfigContainerConverter : JsonConverter +internal sealed class InferenceConfigConverter : JsonConverter { - public override InferenceConfigContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override InferenceConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType != JsonTokenType.StartObject) { @@ -69,20 +69,20 @@ public override InferenceConfigContainer Read(ref Utf8JsonReader reader, Type ty { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new InferenceConfigContainer(propertyName, variant); + return new InferenceConfig(propertyName, variant); } if (propertyName == "regression") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new InferenceConfigContainer(propertyName, variant); + return new InferenceConfig(propertyName, variant); } throw new JsonException(); } - public override void Write(Utf8JsonWriter writer, InferenceConfigContainer value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, InferenceConfig value, JsonSerializerOptions options) { writer.WriteStartObject(); writer.WritePropertyName(value.VariantName); @@ -100,10 +100,10 @@ public override void Write(Utf8JsonWriter writer, InferenceConfigContainer value } } -public sealed partial class InferenceConfigContainerDescriptor : SerializableDescriptor> +public sealed partial class InferenceConfigDescriptor : SerializableDescriptor> { - internal InferenceConfigContainerDescriptor(Action> configure) => configure.Invoke(this); - public InferenceConfigContainerDescriptor() : base() + internal InferenceConfigDescriptor(Action> configure) => configure.Invoke(this); + public InferenceConfigDescriptor() : base() { } @@ -115,7 +115,7 @@ public InferenceConfigContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private InferenceConfigContainerDescriptor Set(Action descriptorAction, string variantName) + private InferenceConfigDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -126,7 +126,7 @@ private InferenceConfigContainerDescriptor Set(Action descripto return Self; } - private InferenceConfigContainerDescriptor Set(object variant, string variantName) + private InferenceConfigDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -134,10 +134,10 @@ private InferenceConfigContainerDescriptor Set(object variant, string return Self; } - public InferenceConfigContainerDescriptor Classification(Ml.ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); - public InferenceConfigContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigContainerDescriptor Regression(Ml.RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); - public InferenceConfigContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); + public InferenceConfigDescriptor Classification(Ml.ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); + public InferenceConfigDescriptor Classification(Action configure) => Set(configure, "classification"); + public InferenceConfigDescriptor Regression(Ml.RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); + public InferenceConfigDescriptor Regression(Action> configure) => Set(configure, "regression"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -160,10 +160,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class InferenceConfigContainerDescriptor : SerializableDescriptor +public sealed partial class InferenceConfigDescriptor : SerializableDescriptor { - internal InferenceConfigContainerDescriptor(Action configure) => configure.Invoke(this); - public InferenceConfigContainerDescriptor() : base() + internal InferenceConfigDescriptor(Action configure) => configure.Invoke(this); + public InferenceConfigDescriptor() : base() { } @@ -175,7 +175,7 @@ public InferenceConfigContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private InferenceConfigContainerDescriptor Set(Action descriptorAction, string variantName) + private InferenceConfigDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -186,7 +186,7 @@ private InferenceConfigContainerDescriptor Set(Action descriptorAction, st return Self; } - private InferenceConfigContainerDescriptor Set(object variant, string variantName) + private InferenceConfigDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -194,11 +194,11 @@ private InferenceConfigContainerDescriptor Set(object variant, string variantNam return Self; } - public InferenceConfigContainerDescriptor Classification(Ml.ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); - public InferenceConfigContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigContainerDescriptor Regression(Ml.RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); - public InferenceConfigContainerDescriptor Regression(Action configure) => Set(configure, "regression"); - public InferenceConfigContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); + public InferenceConfigDescriptor Classification(Ml.ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); + public InferenceConfigDescriptor Classification(Action configure) => Set(configure, "classification"); + public InferenceConfigDescriptor Regression(Ml.RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); + public InferenceConfigDescriptor Regression(Action configure) => Set(configure, "regression"); + public InferenceConfigDescriptor Regression(Action> configure) => Set(configure, "regression"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregation.g.cs index f91a591c126..6756c950ee9 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregation.g.cs @@ -132,7 +132,7 @@ public override void Write(Utf8JsonWriter writer, IpRangeAggregation value, Json } [JsonConverter(typeof(IpRangeAggregationConverter))] -public sealed partial class IpRangeAggregation : Aggregation +public sealed partial class IpRangeAggregation : SearchAggregation { public IpRangeAggregation(string name) => Name = name; internal IpRangeAggregation() @@ -159,9 +159,9 @@ public IpRangeAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -183,7 +183,7 @@ public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elas return Self; } - public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -191,7 +191,7 @@ public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elas return Self; } - public IpRangeAggregationDescriptor Aggregations(Action> configure) + public IpRangeAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -310,7 +310,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -331,9 +331,9 @@ public IpRangeAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -355,7 +355,7 @@ public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.A return Self; } - public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -363,7 +363,7 @@ public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.A return Self; } - public IpRangeAggregationDescriptor Aggregations(Action configure) + public IpRangeAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -488,7 +488,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs index b8608196f05..d96d0a9d3ab 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs @@ -133,7 +133,7 @@ public override void Write(Utf8JsonWriter writer, MatrixStatsAggregation value, } [JsonConverter(typeof(MatrixStatsAggregationConverter))] -public sealed partial class MatrixStatsAggregation : Aggregation +public sealed partial class MatrixStatsAggregation : SearchAggregation { public MatrixStatsAggregation(string name) => Name = name; internal MatrixStatsAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregation.g.cs index b6bebf89537..9c1d54b74cf 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, MaxAggregation value, JsonSeri } [JsonConverter(typeof(MaxAggregationConverter))] -public sealed partial class MaxAggregation : Aggregation +public sealed partial class MaxAggregation : SearchAggregation { public MaxAggregation(string name, Field field) : this(name) => Field = field; public MaxAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregation.g.cs index 07ce91f5813..4559e4c014a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregation.g.cs @@ -169,7 +169,7 @@ public override void Write(Utf8JsonWriter writer, MedianAbsoluteDeviationAggrega } [JsonConverter(typeof(MedianAbsoluteDeviationAggregationConverter))] -public sealed partial class MedianAbsoluteDeviationAggregation : Aggregation +public sealed partial class MedianAbsoluteDeviationAggregation : SearchAggregation { public MedianAbsoluteDeviationAggregation(string name, Field field) : this(name) => Field = field; public MedianAbsoluteDeviationAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregation.g.cs index 789a58843e9..6e0175ac6c8 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, MinAggregation value, JsonSeri } [JsonConverter(typeof(MinAggregationConverter))] -public sealed partial class MinAggregation : Aggregation +public sealed partial class MinAggregation : SearchAggregation { public MinAggregation(string name, Field field) : this(name) => Field = field; public MinAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregation.g.cs index c819801aa65..c60afda251b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregation.g.cs @@ -132,7 +132,7 @@ public override void Write(Utf8JsonWriter writer, MissingAggregation value, Json } [JsonConverter(typeof(MissingAggregationConverter))] -public sealed partial class MissingAggregation : Aggregation +public sealed partial class MissingAggregation : SearchAggregation { public MissingAggregation(string name) => Name = name; internal MissingAggregation() @@ -159,9 +159,9 @@ public MissingAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -177,7 +177,7 @@ public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elas return Self; } - public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -185,7 +185,7 @@ public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elas return Self; } - public MissingAggregationDescriptor Aggregations(Action> configure) + public MissingAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -249,7 +249,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -270,9 +270,9 @@ public MissingAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -288,7 +288,7 @@ public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.A return Self; } - public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -296,7 +296,7 @@ public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.A return Self; } - public MissingAggregationDescriptor Aggregations(Action configure) + public MissingAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -366,7 +366,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs index e6337496bc4..20189303c81 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs @@ -236,7 +236,7 @@ public override void Write(Utf8JsonWriter writer, MultiTermsAggregation value, J } [JsonConverter(typeof(MultiTermsAggregationConverter))] -public sealed partial class MultiTermsAggregation : Aggregation +public sealed partial class MultiTermsAggregation : SearchAggregation { public MultiTermsAggregation(string name) => Name = name; internal MultiTermsAggregation() @@ -276,9 +276,9 @@ public MultiTermsAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private ICollection TermsValue { get; set; } @@ -312,7 +312,7 @@ public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.E return Self; } - public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -320,7 +320,7 @@ public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.E return Self; } - public MultiTermsAggregationDescriptor Aggregations(Action> configure) + public MultiTermsAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -505,7 +505,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -526,9 +526,9 @@ public MultiTermsAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private ICollection TermsValue { get; set; } @@ -562,7 +562,7 @@ public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearc return Self; } - public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -570,7 +570,7 @@ public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearc return Self; } - public MultiTermsAggregationDescriptor Aggregations(Action configure) + public MultiTermsAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -755,7 +755,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregation.g.cs index 319acfce8ba..52881a0717d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregation.g.cs @@ -114,7 +114,7 @@ public override void Write(Utf8JsonWriter writer, NestedAggregation value, JsonS } [JsonConverter(typeof(NestedAggregationConverter))] -public sealed partial class NestedAggregation : Aggregation +public sealed partial class NestedAggregation : SearchAggregation { public NestedAggregation(string name) => Name = name; internal NestedAggregation() @@ -139,9 +139,9 @@ public NestedAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -155,7 +155,7 @@ public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elast return Self; } - public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -163,7 +163,7 @@ public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elast return Self; } - public NestedAggregationDescriptor Aggregations(Action> configure) + public NestedAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -215,7 +215,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -236,9 +236,9 @@ public NestedAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -252,7 +252,7 @@ public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Ag return Self; } - public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -260,7 +260,7 @@ public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Ag return Self; } - public NestedAggregationDescriptor Aggregations(Action configure) + public NestedAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -318,7 +318,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregation.g.cs index eccdc3d713d..43ea82952e2 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregation.g.cs @@ -114,7 +114,7 @@ public override void Write(Utf8JsonWriter writer, ParentAggregation value, JsonS } [JsonConverter(typeof(ParentAggregationConverter))] -public sealed partial class ParentAggregation : Aggregation +public sealed partial class ParentAggregation : SearchAggregation { public ParentAggregation(string name) => Name = name; internal ParentAggregation() @@ -139,9 +139,9 @@ public ParentAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -155,7 +155,7 @@ public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elast return Self; } - public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -163,7 +163,7 @@ public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elast return Self; } - public ParentAggregationDescriptor Aggregations(Action> configure) + public ParentAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -209,7 +209,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -230,9 +230,9 @@ public ParentAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -246,7 +246,7 @@ public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Ag return Self; } - public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -254,7 +254,7 @@ public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Ag return Self; } - public ParentAggregationDescriptor Aggregations(Action configure) + public ParentAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -300,7 +300,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregation.g.cs index 5947178c02f..084d516bbd5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregation.g.cs @@ -133,7 +133,7 @@ public override void Write(Utf8JsonWriter writer, PercentilesBucketAggregation v } [JsonConverter(typeof(PercentilesBucketAggregationConverter))] -public sealed partial class PercentilesBucketAggregation : Aggregation +public sealed partial class PercentilesBucketAggregation : SearchAggregation { public PercentilesBucketAggregation(string name) => Name = name; internal PercentilesBucketAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregation.g.cs index f6c89878f56..9903e820092 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregation.g.cs @@ -186,7 +186,7 @@ public override void Write(Utf8JsonWriter writer, RangeAggregation value, JsonSe } [JsonConverter(typeof(RangeAggregationConverter))] -public sealed partial class RangeAggregation : Aggregation +public sealed partial class RangeAggregation : SearchAggregation { public RangeAggregation(string name) => Name = name; internal RangeAggregation() @@ -219,9 +219,9 @@ public RangeAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -249,7 +249,7 @@ public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasti return Self; } - public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -257,7 +257,7 @@ public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasti return Self; } - public RangeAggregationDescriptor Aggregations(Action> configure) + public RangeAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -412,7 +412,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -433,9 +433,9 @@ public RangeAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } @@ -463,7 +463,7 @@ public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Agg return Self; } - public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -471,7 +471,7 @@ public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Agg return Self; } - public RangeAggregationDescriptor Aggregations(Action configure) + public RangeAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -632,7 +632,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregation.g.cs index 43f17698999..0cbf47cb3b5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregation.g.cs @@ -187,7 +187,7 @@ public override void Write(Utf8JsonWriter writer, RateAggregation value, JsonSer } [JsonConverter(typeof(RateAggregationConverter))] -public sealed partial class RateAggregation : Aggregation +public sealed partial class RateAggregation : SearchAggregation { public RateAggregation(string name, Field field) : this(name) => Field = field; public RateAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregation.g.cs index 592e9a6de4e..6f007e68958 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregation.g.cs @@ -114,7 +114,7 @@ public override void Write(Utf8JsonWriter writer, ReverseNestedAggregation value } [JsonConverter(typeof(ReverseNestedAggregationConverter))] -public sealed partial class ReverseNestedAggregation : Aggregation +public sealed partial class ReverseNestedAggregation : SearchAggregation { public ReverseNestedAggregation(string name) => Name = name; internal ReverseNestedAggregation() @@ -139,9 +139,9 @@ public ReverseNestedAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -155,7 +155,7 @@ public ReverseNestedAggregationDescriptor Aggregations(Elastic.Client return Self; } - public ReverseNestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public ReverseNestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -163,7 +163,7 @@ public ReverseNestedAggregationDescriptor Aggregations(Elastic.Client return Self; } - public ReverseNestedAggregationDescriptor Aggregations(Action> configure) + public ReverseNestedAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -215,7 +215,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -236,9 +236,9 @@ public ReverseNestedAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -252,7 +252,7 @@ public ReverseNestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticse return Self; } - public ReverseNestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public ReverseNestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -260,7 +260,7 @@ public ReverseNestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticse return Self; } - public ReverseNestedAggregationDescriptor Aggregations(Action configure) + public ReverseNestedAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -318,7 +318,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregation.g.cs index 7c3c937d0ee..51133c366ae 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregation.g.cs @@ -114,7 +114,7 @@ public override void Write(Utf8JsonWriter writer, SamplerAggregation value, Json } [JsonConverter(typeof(SamplerAggregationConverter))] -public sealed partial class SamplerAggregation : Aggregation +public sealed partial class SamplerAggregation : SearchAggregation { public SamplerAggregation(string name) => Name = name; internal SamplerAggregation() @@ -139,9 +139,9 @@ public SamplerAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -155,7 +155,7 @@ public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elas return Self; } - public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -163,7 +163,7 @@ public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elas return Self; } - public SamplerAggregationDescriptor Aggregations(Action> configure) + public SamplerAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -209,7 +209,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -230,9 +230,9 @@ public SamplerAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Dictionary? MetaValue { get; set; } @@ -246,7 +246,7 @@ public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.A return Self; } - public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -254,7 +254,7 @@ public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.A return Self; } - public SamplerAggregationDescriptor Aggregations(Action configure) + public SamplerAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -300,7 +300,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregation.g.cs index 6bdba5e70c5..947babcad63 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregation.g.cs @@ -223,7 +223,7 @@ public override void Write(Utf8JsonWriter writer, ScriptedMetricAggregation valu } [JsonConverter(typeof(ScriptedMetricAggregationConverter))] -public sealed partial class ScriptedMetricAggregation : Aggregation +public sealed partial class ScriptedMetricAggregation : SearchAggregation { public ScriptedMetricAggregation(string name, Field field) : this(name) => Field = field; public ScriptedMetricAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregation.g.cs index 2eba5f7d067..7453c55a57c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, StatsAggregation value, JsonSe } [JsonConverter(typeof(StatsAggregationConverter))] -public sealed partial class StatsAggregation : Aggregation +public sealed partial class StatsAggregation : SearchAggregation { public StatsAggregation(string name, Field field) : this(name) => Field = field; public StatsAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregation.g.cs index 1c195be9fa1..c83666edc0b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregation.g.cs @@ -115,7 +115,7 @@ public override void Write(Utf8JsonWriter writer, StatsBucketAggregation value, } [JsonConverter(typeof(StatsBucketAggregationConverter))] -public sealed partial class StatsBucketAggregation : Aggregation +public sealed partial class StatsBucketAggregation : SearchAggregation { public StatsBucketAggregation(string name) => Name = name; internal StatsBucketAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregation.g.cs index b076cfb88fe..3d9e041dd9e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, StringStatsAggregation value, } [JsonConverter(typeof(StringStatsAggregationConverter))] -public sealed partial class StringStatsAggregation : Aggregation +public sealed partial class StringStatsAggregation : SearchAggregation { public StringStatsAggregation(string name, Field field) : this(name) => Field = field; public StringStatsAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregation.g.cs index 546dcbc74fe..5da8915c468 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, SumAggregation value, JsonSeri } [JsonConverter(typeof(SumAggregationConverter))] -public sealed partial class SumAggregation : Aggregation +public sealed partial class SumAggregation : SearchAggregation { public SumAggregation(string name, Field field) : this(name) => Field = field; public SumAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregation.g.cs index 41d9ea9094c..10c80a73fa1 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregation.g.cs @@ -133,7 +133,7 @@ public override void Write(Utf8JsonWriter writer, TTestAggregation value, JsonSe } [JsonConverter(typeof(TTestAggregationConverter))] -public sealed partial class TTestAggregation : Aggregation +public sealed partial class TTestAggregation : SearchAggregation { public TTestAggregation(string name) => Name = name; internal TTestAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs index 175e65ee723..e4a99eadb2d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs @@ -384,7 +384,7 @@ public override void Write(Utf8JsonWriter writer, TermsAggregation value, JsonSe } [JsonConverter(typeof(TermsAggregationConverter))] -public sealed partial class TermsAggregation : Aggregation +public sealed partial class TermsAggregation : SearchAggregation { public TermsAggregation(string name) => Name = name; internal TermsAggregation() @@ -440,9 +440,9 @@ public TermsAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action> AggregationsDescriptorAction { get; set; } + private Action> AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectModeValue { get; set; } @@ -486,7 +486,7 @@ public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasti return Self; } - public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -494,7 +494,7 @@ public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasti return Self; } - public TermsAggregationDescriptor Aggregations(Action> configure) + public TermsAggregationDescriptor Aggregations(Action> configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -726,7 +726,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { @@ -747,9 +747,9 @@ public TermsAggregationDescriptor() : base() private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; } - private Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor AggregationsDescriptor { get; set; } + private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; } - private Action AggregationsDescriptorAction { get; set; } + private Action AggregationsDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectModeValue { get; set; } @@ -793,7 +793,7 @@ public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Agg return Self; } - public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationContainerDescriptor descriptor) + public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor descriptor) { AggregationsValue = null; AggregationsDescriptorAction = null; @@ -801,7 +801,7 @@ public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Agg return Self; } - public TermsAggregationDescriptor Aggregations(Action configure) + public TermsAggregationDescriptor Aggregations(Action configure) { AggregationsValue = null; AggregationsDescriptor = null; @@ -1039,7 +1039,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (AggregationsDescriptorAction is not null) { writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, new AggregationContainerDescriptor(AggregationsDescriptorAction), options); + JsonSerializer.Serialize(writer, new AggregationDescriptor(AggregationsDescriptorAction), options); } else if (AggregationsValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TestPopulation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TestPopulation.g.cs index fc2572b290f..e7a652fc7de 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TestPopulation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TestPopulation.g.cs @@ -33,7 +33,7 @@ public sealed partial class TestPopulation [JsonInclude] [JsonPropertyName("filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Filter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; } [JsonInclude] [JsonPropertyName("script")] @@ -47,17 +47,17 @@ public TestPopulationDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; } private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; } - public TestPopulationDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public TestPopulationDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -65,7 +65,7 @@ public TestPopulationDescriptor Filter(Elastic.Clients.Elasticsearch. return Self; } - public TestPopulationDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public TestPopulationDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -73,7 +73,7 @@ public TestPopulationDescriptor Filter(QueryDsl.QueryContainerDescrip return Self; } - public TestPopulationDescriptor Filter(Action> configure) + public TestPopulationDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -110,7 +110,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { @@ -137,17 +137,17 @@ public TestPopulationDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; } private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; } - public TestPopulationDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public TestPopulationDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -155,7 +155,7 @@ public TestPopulationDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Qu return Self; } - public TestPopulationDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public TestPopulationDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -163,7 +163,7 @@ public TestPopulationDescriptor Filter(QueryDsl.QueryContainerDescriptor descrip return Self; } - public TestPopulationDescriptor Filter(Action configure) + public TestPopulationDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -206,7 +206,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs index 308e6e27480..462c25a77bf 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs @@ -349,7 +349,7 @@ public override void Write(Utf8JsonWriter writer, TopHitsAggregation value, Json } [JsonConverter(typeof(TopHitsAggregationConverter))] -public sealed partial class TopHitsAggregation : Aggregation +public sealed partial class TopHitsAggregation : SearchAggregation { public TopHitsAggregation(string name, Field field) : this(name) => Field = field; public TopHitsAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs index 42b5f20a42c..6ce5244c9ad 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs @@ -187,7 +187,7 @@ public override void Write(Utf8JsonWriter writer, TopMetricsAggregation value, J } [JsonConverter(typeof(TopMetricsAggregationConverter))] -public sealed partial class TopMetricsAggregation : Aggregation +public sealed partial class TopMetricsAggregation : SearchAggregation { public TopMetricsAggregation(string name, Field field) : this(name) => Field = field; public TopMetricsAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregation.g.cs index 619eab7ae45..f7c6e61ecd3 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, ValueCountAggregation value, J } [JsonConverter(typeof(ValueCountAggregationConverter))] -public sealed partial class ValueCountAggregation : Aggregation +public sealed partial class ValueCountAggregation : SearchAggregation { public ValueCountAggregation(string name, Field field) : this(name) => Field = field; public ValueCountAggregation(string name) => Name = name; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregation.g.cs index fb49380dfb7..039411565cb 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, VariableWidthHistogramAggregat } [JsonConverter(typeof(VariableWidthHistogramAggregationConverter))] -public sealed partial class VariableWidthHistogramAggregation : Aggregation +public sealed partial class VariableWidthHistogramAggregation : SearchAggregation { public VariableWidthHistogramAggregation(string name) => Name = name; internal VariableWidthHistogramAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregation.g.cs index 8f405d206fa..2eae14833fe 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregation.g.cs @@ -151,7 +151,7 @@ public override void Write(Utf8JsonWriter writer, WeightedAverageAggregation val } [JsonConverter(typeof(WeightedAverageAggregationConverter))] -public sealed partial class WeightedAverageAggregation : Aggregation +public sealed partial class WeightedAverageAggregation : SearchAggregation { public WeightedAverageAggregation(string name) => Name = name; internal WeightedAverageAggregation() diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/Operation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetOperation.g.cs similarity index 81% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/Operation.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetOperation.g.cs index 648ecc28fd8..b81e71dcebd 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/Operation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetOperation.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Core.MGet; -public sealed partial class Operation +public sealed partial class MultiGetOperation { [JsonInclude] [JsonPropertyName("_id")] @@ -56,10 +56,10 @@ public sealed partial class Operation public Elastic.Clients.Elasticsearch.VersionType? VersionType { get; set; } } -public sealed partial class OperationDescriptor : SerializableDescriptor +public sealed partial class MultiGetOperationDescriptor : SerializableDescriptor { - internal OperationDescriptor(Action configure) => configure.Invoke(this); - public OperationDescriptor() : base() + internal MultiGetOperationDescriptor(Action configure) => configure.Invoke(this); + public MultiGetOperationDescriptor() : base() { } @@ -77,43 +77,43 @@ public OperationDescriptor() : base() private Elastic.Clients.Elasticsearch.VersionType? VersionTypeValue { get; set; } - public OperationDescriptor Id(Elastic.Clients.Elasticsearch.Id id) + public MultiGetOperationDescriptor Id(Elastic.Clients.Elasticsearch.Id id) { IdValue = id; return Self; } - public OperationDescriptor Index(Elastic.Clients.Elasticsearch.IndexName? index) + public MultiGetOperationDescriptor Index(Elastic.Clients.Elasticsearch.IndexName? index) { IndexValue = index; return Self; } - public OperationDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) + public MultiGetOperationDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; return Self; } - public OperationDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) + public MultiGetOperationDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) { RoutingValue = routing; return Self; } - public OperationDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) + public MultiGetOperationDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) { StoredFieldsValue = storedFields; return Self; } - public OperationDescriptor Version(long? version) + public MultiGetOperationDescriptor Version(long? version) { VersionValue = version; return Self; } - public OperationDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) + public MultiGetOperationDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) { VersionTypeValue = versionType; return Self; diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs index 3fd1aa0adea..fb56fbdd2ff 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs @@ -25,466 +25,127 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Core.MSearch; -internal sealed class MultisearchBodyConverter : JsonConverter -{ - public override MultisearchBody Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType != JsonTokenType.StartObject) - throw new JsonException("Unexpected JSON detected."); - var variant = new MultisearchBody(); - while (reader.Read() && reader.TokenType != JsonTokenType.EndObject) - { - if (reader.TokenType == JsonTokenType.PropertyName) - { - var property = reader.GetString(); - if (property == "_source") - { - variant.Source = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "aggregations" || property == "aggs") - { - variant.Aggregations = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "collapse") - { - variant.Collapse = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "docvalue_fields") - { - variant.DocvalueFields = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "explain") - { - variant.Explain = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "ext") - { - variant.Ext = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "fields") - { - variant.Fields = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "from") - { - variant.From = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "highlight") - { - variant.Highlight = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "indices_boost") - { - variant.IndicesBoost = JsonSerializer.Deserialize>?>(ref reader, options); - continue; - } - - if (property == "knn") - { - variant.Knn = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "min_score") - { - variant.MinScore = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "pit") - { - variant.Pit = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "post_filter") - { - variant.PostFilter = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "profile") - { - variant.Profile = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "query") - { - variant.Query = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "rescore") - { - variant.Rescore = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "runtime_mappings") - { - variant.RuntimeMappings = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "script_fields") - { - variant.ScriptFields = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "search_after") - { - variant.SearchAfter = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "seq_no_primary_term") - { - variant.SeqNoPrimaryTerm = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "size") - { - variant.Size = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "sort") - { - variant.Sort = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "stats") - { - variant.Stats = JsonSerializer.Deserialize?>(ref reader, options); - continue; - } - - if (property == "stored_fields") - { - variant.StoredFields = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "suggest") - { - variant.Suggest = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "terminate_after") - { - variant.TerminateAfter = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "timeout") - { - variant.Timeout = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "track_scores") - { - variant.TrackScores = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "track_total_hits") - { - variant.TrackTotalHits = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "version") - { - variant.Version = JsonSerializer.Deserialize(ref reader, options); - continue; - } - } - } - - return variant; - } - - public override void Write(Utf8JsonWriter writer, MultisearchBody value, JsonSerializerOptions options) - { - writer.WriteStartObject(); - if (value.Source is not null) - { - writer.WritePropertyName("_source"); - JsonSerializer.Serialize(writer, value.Source, options); - } - - if (value.Aggregations is not null) - { - writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, value.Aggregations, options); - } - - if (value.Collapse is not null) - { - writer.WritePropertyName("collapse"); - JsonSerializer.Serialize(writer, value.Collapse, options); - } - - if (value.DocvalueFields is not null) - { - writer.WritePropertyName("docvalue_fields"); - JsonSerializer.Serialize(writer, value.DocvalueFields, options); - } - - if (value.Explain.HasValue) - { - writer.WritePropertyName("explain"); - writer.WriteBooleanValue(value.Explain.Value); - } - - if (value.Ext is not null) - { - writer.WritePropertyName("ext"); - JsonSerializer.Serialize(writer, value.Ext, options); - } - - if (value.Fields is not null) - { - writer.WritePropertyName("fields"); - JsonSerializer.Serialize(writer, value.Fields, options); - } - - if (value.From.HasValue) - { - writer.WritePropertyName("from"); - writer.WriteNumberValue(value.From.Value); - } - - if (value.Highlight is not null) - { - writer.WritePropertyName("highlight"); - JsonSerializer.Serialize(writer, value.Highlight, options); - } - - if (value.IndicesBoost is not null) - { - writer.WritePropertyName("indices_boost"); - JsonSerializer.Serialize(writer, value.IndicesBoost, options); - } - - if (value.Knn is not null) - { - writer.WritePropertyName("knn"); - JsonSerializer.Serialize(writer, value.Knn, options); - } - - if (value.MinScore.HasValue) - { - writer.WritePropertyName("min_score"); - writer.WriteNumberValue(value.MinScore.Value); - } - - if (value.Pit is not null) - { - writer.WritePropertyName("pit"); - JsonSerializer.Serialize(writer, value.Pit, options); - } - - if (value.PostFilter is not null) - { - writer.WritePropertyName("post_filter"); - JsonSerializer.Serialize(writer, value.PostFilter, options); - } - - if (value.Profile.HasValue) - { - writer.WritePropertyName("profile"); - writer.WriteBooleanValue(value.Profile.Value); - } - - if (value.Query is not null) - { - writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, value.Query, options); - } - - if (value.Rescore is not null) - { - writer.WritePropertyName("rescore"); - JsonSerializer.Serialize(writer, value.Rescore, options); - } - - if (value.RuntimeMappings is not null) - { - writer.WritePropertyName("runtime_mappings"); - JsonSerializer.Serialize(writer, value.RuntimeMappings, options); - } - - if (value.ScriptFields is not null) - { - writer.WritePropertyName("script_fields"); - JsonSerializer.Serialize(writer, value.ScriptFields, options); - } - - if (value.SearchAfter is not null) - { - writer.WritePropertyName("search_after"); - JsonSerializer.Serialize(writer, value.SearchAfter, options); - } - - if (value.SeqNoPrimaryTerm.HasValue) - { - writer.WritePropertyName("seq_no_primary_term"); - writer.WriteBooleanValue(value.SeqNoPrimaryTerm.Value); - } - - if (value.Size.HasValue) - { - writer.WritePropertyName("size"); - writer.WriteNumberValue(value.Size.Value); - } - - if (value.Sort is not null) - { - writer.WritePropertyName("sort"); - JsonSerializer.Serialize(writer, value.Sort, options); - } - - if (value.Stats is not null) - { - writer.WritePropertyName("stats"); - JsonSerializer.Serialize(writer, value.Stats, options); - } - - if (value.StoredFields is not null) - { - writer.WritePropertyName("stored_fields"); - JsonSerializer.Serialize(writer, value.StoredFields, options); - } - - if (value.Suggest is not null) - { - writer.WritePropertyName("suggest"); - JsonSerializer.Serialize(writer, value.Suggest, options); - } - - if (value.TerminateAfter.HasValue) - { - writer.WritePropertyName("terminate_after"); - writer.WriteNumberValue(value.TerminateAfter.Value); - } - - if (!string.IsNullOrEmpty(value.Timeout)) - { - writer.WritePropertyName("timeout"); - writer.WriteStringValue(value.Timeout); - } - - if (value.TrackScores.HasValue) - { - writer.WritePropertyName("track_scores"); - writer.WriteBooleanValue(value.TrackScores.Value); - } - - if (value.TrackTotalHits is not null) - { - writer.WritePropertyName("track_total_hits"); - JsonSerializer.Serialize(writer, value.TrackTotalHits, options); - } - - if (value.Version.HasValue) - { - writer.WritePropertyName("version"); - writer.WriteBooleanValue(value.Version.Value); - } - - writer.WriteEndObject(); - } -} - -[JsonConverter(typeof(MultisearchBodyConverter))] public sealed partial class MultisearchBody { + [JsonInclude] + [JsonPropertyName("_source")] public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; } - public Dictionary? Aggregations { get; set; } - + [JsonInclude] + [JsonPropertyName("collapse")] public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; } + [JsonInclude] + [JsonPropertyName("docvalue_fields")] public ICollection? DocvalueFields { get; set; } + [JsonInclude] + [JsonPropertyName("explain")] public bool? Explain { get; set; } + [JsonInclude] + [JsonPropertyName("ext")] public Dictionary? Ext { get; set; } + [JsonInclude] + [JsonPropertyName("fields")] public ICollection? Fields { get; set; } + [JsonInclude] + [JsonPropertyName("from")] public int? From { get; set; } + [JsonInclude] + [JsonPropertyName("highlight")] public Elastic.Clients.Elasticsearch.Core.Search.Highlight? Highlight { get; set; } + [JsonInclude] + [JsonPropertyName("indices_boost")] public ICollection>? IndicesBoost { get; set; } + [JsonInclude] + [JsonPropertyName("knn")] public Elastic.Clients.Elasticsearch.KnnQuery? Knn { get; set; } + [JsonInclude] + [JsonPropertyName("min_score")] public double? MinScore { get; set; } + [JsonInclude] + [JsonPropertyName("pit")] public Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? Pit { get; set; } - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilter { get; set; } + [JsonInclude] + [JsonPropertyName("post_filter")] + public Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilter { get; set; } + [JsonInclude] + [JsonPropertyName("profile")] public bool? Profile { get; set; } - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + [JsonInclude] + [JsonPropertyName("query")] + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } + [JsonInclude] + [JsonPropertyName("rescore")] public ICollection? Rescore { get; set; } + [JsonInclude] + [JsonPropertyName("runtime_mappings")] public Dictionary? RuntimeMappings { get; set; } + [JsonInclude] + [JsonPropertyName("script_fields")] public Dictionary? ScriptFields { get; set; } + [JsonInclude] + [JsonPropertyName("search_after")] public ICollection? SearchAfter { get; set; } + [JsonInclude] + [JsonPropertyName("seq_no_primary_term")] public bool? SeqNoPrimaryTerm { get; set; } + [JsonInclude] + [JsonPropertyName("size")] public int? Size { get; set; } + [JsonInclude] + [JsonPropertyName("sort")] [JsonConverter(typeof(SortConverter))] public ICollection? Sort { get; set; } + [JsonInclude] + [JsonPropertyName("stats")] public ICollection? Stats { get; set; } + [JsonInclude] + [JsonPropertyName("stored_fields")] public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; } + [JsonInclude] + [JsonPropertyName("suggest")] public Elastic.Clients.Elasticsearch.Core.Search.Suggester? Suggest { get; set; } + [JsonInclude] + [JsonPropertyName("terminate_after")] public long? TerminateAfter { get; set; } + [JsonInclude] + [JsonPropertyName("timeout")] public string? Timeout { get; set; } + [JsonInclude] + [JsonPropertyName("track_scores")] public bool? TrackScores { get; set; } + [JsonInclude] + [JsonPropertyName("track_total_hits")] public Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHits { get; set; } + [JsonInclude] + [JsonPropertyName("version")] public bool? Version { get; set; } } @@ -529,17 +190,17 @@ public MultisearchBodyDescriptor() : base() private Action> KnnDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor PostFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; } - private Action> PostFilterDescriptorAction { get; set; } + private Action> PostFilterDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private ICollection? RescoreValue { get; set; } @@ -559,8 +220,6 @@ public MultisearchBodyDescriptor() : base() private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } - private Dictionary? AggregationsValue { get; set; } - private bool? ExplainValue { get; set; } private Dictionary? ExtValue { get; set; } @@ -753,7 +412,7 @@ public MultisearchBodyDescriptor Knn(Action PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter) + public MultisearchBodyDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? postFilter) { PostFilterDescriptor = null; PostFilterDescriptorAction = null; @@ -761,7 +420,7 @@ public MultisearchBodyDescriptor PostFilter(Elastic.Clients.Elasticse return Self; } - public MultisearchBodyDescriptor PostFilter(QueryDsl.QueryContainerDescriptor descriptor) + public MultisearchBodyDescriptor PostFilter(QueryDsl.QueryDescriptor descriptor) { PostFilterValue = null; PostFilterDescriptorAction = null; @@ -769,7 +428,7 @@ public MultisearchBodyDescriptor PostFilter(QueryDsl.QueryContainerDe return Self; } - public MultisearchBodyDescriptor PostFilter(Action> configure) + public MultisearchBodyDescriptor PostFilter(Action> configure) { PostFilterValue = null; PostFilterDescriptor = null; @@ -777,7 +436,7 @@ public MultisearchBodyDescriptor PostFilter(Action Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public MultisearchBodyDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -785,7 +444,7 @@ public MultisearchBodyDescriptor Query(Elastic.Clients.Elasticsearch. return Self; } - public MultisearchBodyDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public MultisearchBodyDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -793,7 +452,7 @@ public MultisearchBodyDescriptor Query(QueryDsl.QueryContainerDescrip return Self; } - public MultisearchBodyDescriptor Query(Action> configure) + public MultisearchBodyDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -879,12 +538,6 @@ public MultisearchBodyDescriptor Source(Elastic.Clients.Elasticsearch return Self; } - public MultisearchBodyDescriptor Aggregations(Func, FluentDictionary> selector) - { - AggregationsValue = selector?.Invoke(new FluentDictionary()); - return Self; - } - public MultisearchBodyDescriptor Explain(bool? explain = true) { ExplainValue = explain; @@ -1162,7 +815,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (PostFilterDescriptorAction is not null) { writer.WritePropertyName("post_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(PostFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(PostFilterDescriptorAction), options); } else if (PostFilterValue is not null) { @@ -1178,7 +831,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -1252,12 +905,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, SourceValue, options); } - if (AggregationsValue is not null) - { - writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, AggregationsValue, options); - } - if (ExplainValue.HasValue) { writer.WritePropertyName("explain"); @@ -1443,17 +1090,17 @@ public MultisearchBodyDescriptor() : base() private Action KnnDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? PostFilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor PostFilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; } - private Action PostFilterDescriptorAction { get; set; } + private Action PostFilterDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private ICollection? RescoreValue { get; set; } @@ -1473,8 +1120,6 @@ public MultisearchBodyDescriptor() : base() private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } - private Dictionary? AggregationsValue { get; set; } - private bool? ExplainValue { get; set; } private Dictionary? ExtValue { get; set; } @@ -1667,7 +1312,7 @@ public MultisearchBodyDescriptor Knn(Action configure) return Self; } - public MultisearchBodyDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? postFilter) + public MultisearchBodyDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? postFilter) { PostFilterDescriptor = null; PostFilterDescriptorAction = null; @@ -1675,7 +1320,7 @@ public MultisearchBodyDescriptor PostFilter(Elastic.Clients.Elasticsearch.QueryD return Self; } - public MultisearchBodyDescriptor PostFilter(QueryDsl.QueryContainerDescriptor descriptor) + public MultisearchBodyDescriptor PostFilter(QueryDsl.QueryDescriptor descriptor) { PostFilterValue = null; PostFilterDescriptorAction = null; @@ -1683,7 +1328,7 @@ public MultisearchBodyDescriptor PostFilter(QueryDsl.QueryContainerDescriptor de return Self; } - public MultisearchBodyDescriptor PostFilter(Action configure) + public MultisearchBodyDescriptor PostFilter(Action configure) { PostFilterValue = null; PostFilterDescriptor = null; @@ -1691,7 +1336,7 @@ public MultisearchBodyDescriptor PostFilter(Action configure) + public MultisearchBodyDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -1793,12 +1438,6 @@ public MultisearchBodyDescriptor Source(Elastic.Clients.Elasticsearch.Core.Searc return Self; } - public MultisearchBodyDescriptor Aggregations(Func, FluentDictionary> selector) - { - AggregationsValue = selector?.Invoke(new FluentDictionary()); - return Self; - } - public MultisearchBodyDescriptor Explain(bool? explain = true) { ExplainValue = explain; @@ -2076,7 +1715,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (PostFilterDescriptorAction is not null) { writer.WritePropertyName("post_filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(PostFilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(PostFilterDescriptorAction), options); } else if (PostFilterValue is not null) { @@ -2092,7 +1731,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -2166,12 +1805,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, SourceValue, options); } - if (AggregationsValue is not null) - { - writer.WritePropertyName("aggregations"); - JsonSerializer.Serialize(writer, AggregationsValue, options); - } - if (ExplainValue.HasValue) { writer.WritePropertyName("explain"); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ResponseItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiGetResponseItem.g.cs similarity index 79% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ResponseItem.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiGetResponseItem.g.cs index 82cbe6b7a7b..bb6ada0855a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ResponseItem.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiGetResponseItem.g.cs @@ -26,13 +26,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Core.MGet; -public partial class ResponseItem : Union, Elastic.Clients.Elasticsearch.Core.MGet.MultiGetError> +public partial class MultiGetResponseItem : Union, Elastic.Clients.Elasticsearch.Core.MGet.MultiGetError> { - public ResponseItem(Elastic.Clients.Elasticsearch.Core.Get.GetResult result) : base(result) + public MultiGetResponseItem(Elastic.Clients.Elasticsearch.Core.Get.GetResult result) : base(result) { } - public ResponseItem(Elastic.Clients.Elasticsearch.Core.MGet.MultiGetError failure) : base(failure) + public MultiGetResponseItem(Elastic.Clients.Elasticsearch.Core.MGet.MultiGetError failure) : base(failure) { } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchResponseItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiSearchResponseItem.g.cs similarity index 78% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchResponseItem.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiSearchResponseItem.g.cs index 6be9488371e..297915d1f96 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchResponseItem.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiSearchResponseItem.g.cs @@ -26,13 +26,13 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Core.MSearch; -public partial class SearchResponseItem : Union, Elastic.Clients.Elasticsearch.ErrorResponseBase> +public partial class MultiSearchResponseItem : Union, Elastic.Clients.Elasticsearch.ErrorResponseBase> { - public SearchResponseItem(Elastic.Clients.Elasticsearch.Core.MSearch.MultiSearchItem result) : base(result) + public MultiSearchResponseItem(Elastic.Clients.Elasticsearch.Core.MSearch.MultiSearchItem result) : base(result) { } - public SearchResponseItem(Elastic.Clients.Elasticsearch.ErrorResponseBase failure) : base(failure) + public MultiSearchResponseItem(Elastic.Clients.Elasticsearch.ErrorResponseBase failure) : base(failure) { } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs index 4a90966d563..a2a762f2883 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs @@ -29,7 +29,7 @@ public sealed partial class RankEvalQuery { [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; } [JsonInclude] [JsonPropertyName("size")] @@ -43,15 +43,15 @@ public RankEvalQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private int? SizeValue { get; set; } - public RankEvalQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public RankEvalQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -59,7 +59,7 @@ public RankEvalQueryDescriptor Query(Elastic.Clients.Elasticsearch.Qu return Self; } - public RankEvalQueryDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public RankEvalQueryDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -67,7 +67,7 @@ public RankEvalQueryDescriptor Query(QueryDsl.QueryContainerDescripto return Self; } - public RankEvalQueryDescriptor Query(Action> configure) + public RankEvalQueryDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -92,7 +92,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else { @@ -117,15 +117,15 @@ public RankEvalQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private int? SizeValue { get; set; } - public RankEvalQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public RankEvalQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -133,7 +133,7 @@ public RankEvalQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Quer return Self; } - public RankEvalQueryDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public RankEvalQueryDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -141,7 +141,7 @@ public RankEvalQueryDescriptor Query(QueryDsl.QueryContainerDescriptor descripto return Self; } - public RankEvalQueryDescriptor Query(Action configure) + public RankEvalQueryDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -166,7 +166,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs index f5debb0b798..bacb194de9a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs @@ -37,7 +37,7 @@ public sealed partial class Source [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } [JsonInclude] [JsonPropertyName("remote")] @@ -68,11 +68,11 @@ public SourceDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; } @@ -102,7 +102,7 @@ public SourceDescriptor() : base() private int? SizeValue { get; set; } - public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -110,7 +110,7 @@ public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl. return Self; } - public SourceDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public SourceDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -118,7 +118,7 @@ public SourceDescriptor Query(QueryDsl.QueryContainerDescriptor Query(Action> configure) + public SourceDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -245,7 +245,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -345,11 +345,11 @@ public SourceDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; } @@ -379,7 +379,7 @@ public SourceDescriptor() : base() private int? SizeValue { get; set; } - public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -387,7 +387,7 @@ public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContai return Self; } - public SourceDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public SourceDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -395,7 +395,7 @@ public SourceDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) return Self; } - public SourceDescriptor Query(Action configure) + public SourceDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -522,7 +522,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggester.g.cs index ad5ad825d07..401b835dd3c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggester.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggester.g.cs @@ -59,7 +59,7 @@ public sealed partial class CompletionSuggester [JsonPropertyName("skip_duplicates")] public bool? SkipDuplicates { get; set; } - public static implicit operator FieldSuggester(CompletionSuggester completionSuggester) => FieldSuggester.Completion(completionSuggester); + public static implicit operator FieldSuggester(CompletionSuggester completionSuggester) => Core.Search.FieldSuggester.Completion(completionSuggester); } public sealed partial class CompletionSuggesterDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Highlight.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Highlight.g.cs index 03234fa92f6..61af6c2a9cb 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Highlight.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Highlight.g.cs @@ -69,7 +69,7 @@ public sealed partial class Highlight [JsonInclude] [JsonPropertyName("highlight_query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? HighlightQuery { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQuery { get; set; } [JsonInclude] [JsonPropertyName("max_analyzed_offset")] @@ -127,11 +127,11 @@ public HighlightDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? HighlightQueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor HighlightQueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor HighlightQueryDescriptor { get; set; } - private Action> HighlightQueryDescriptorAction { get; set; } + private Action> HighlightQueryDescriptorAction { get; set; } private string? BoundaryCharsValue { get; set; } @@ -177,7 +177,7 @@ public HighlightDescriptor() : base() private Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? TypeValue { get; set; } - public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery) + public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.Query? highlightQuery) { HighlightQueryDescriptor = null; HighlightQueryDescriptorAction = null; @@ -185,7 +185,7 @@ public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsear return Self; } - public HighlightDescriptor HighlightQuery(QueryDsl.QueryContainerDescriptor descriptor) + public HighlightDescriptor HighlightQuery(QueryDsl.QueryDescriptor descriptor) { HighlightQueryValue = null; HighlightQueryDescriptorAction = null; @@ -193,7 +193,7 @@ public HighlightDescriptor HighlightQuery(QueryDsl.QueryContainerDesc return Self; } - public HighlightDescriptor HighlightQuery(Action> configure) + public HighlightDescriptor HighlightQuery(Action> configure) { HighlightQueryValue = null; HighlightQueryDescriptor = null; @@ -344,7 +344,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (HighlightQueryDescriptorAction is not null) { writer.WritePropertyName("highlight_query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(HighlightQueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(HighlightQueryDescriptorAction), options); } else if (HighlightQueryValue is not null) { @@ -491,11 +491,11 @@ public HighlightDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? HighlightQueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor HighlightQueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor HighlightQueryDescriptor { get; set; } - private Action HighlightQueryDescriptorAction { get; set; } + private Action HighlightQueryDescriptorAction { get; set; } private string? BoundaryCharsValue { get; set; } @@ -541,7 +541,7 @@ public HighlightDescriptor() : base() private Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? TypeValue { get; set; } - public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery) + public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.Query? highlightQuery) { HighlightQueryDescriptor = null; HighlightQueryDescriptorAction = null; @@ -549,7 +549,7 @@ public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl return Self; } - public HighlightDescriptor HighlightQuery(QueryDsl.QueryContainerDescriptor descriptor) + public HighlightDescriptor HighlightQuery(QueryDsl.QueryDescriptor descriptor) { HighlightQueryValue = null; HighlightQueryDescriptorAction = null; @@ -557,7 +557,7 @@ public HighlightDescriptor HighlightQuery(QueryDsl.QueryContainerDescriptor desc return Self; } - public HighlightDescriptor HighlightQuery(Action configure) + public HighlightDescriptor HighlightQuery(Action configure) { HighlightQueryValue = null; HighlightQueryDescriptor = null; @@ -708,7 +708,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (HighlightQueryDescriptorAction is not null) { writer.WritePropertyName("highlight_query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(HighlightQueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(HighlightQueryDescriptorAction), options); } else if (HighlightQueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HighlightField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HighlightField.g.cs index 11f94396692..cac2e7fecaa 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HighlightField.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HighlightField.g.cs @@ -69,7 +69,7 @@ public sealed partial class HighlightField [JsonInclude] [JsonPropertyName("highlight_query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? HighlightQuery { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQuery { get; set; } [JsonInclude] [JsonPropertyName("matched_fields")] @@ -131,11 +131,11 @@ public HighlightFieldDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? HighlightQueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor HighlightQueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor HighlightQueryDescriptor { get; set; } - private Action> HighlightQueryDescriptorAction { get; set; } + private Action> HighlightQueryDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Analysis.Analyzers? AnalyzerValue { get; set; } @@ -183,7 +183,7 @@ public HighlightFieldDescriptor() : base() private Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? TypeValue { get; set; } - public HighlightFieldDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery) + public HighlightFieldDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.Query? highlightQuery) { HighlightQueryDescriptor = null; HighlightQueryDescriptorAction = null; @@ -191,7 +191,7 @@ public HighlightFieldDescriptor HighlightQuery(Elastic.Clients.Elasti return Self; } - public HighlightFieldDescriptor HighlightQuery(QueryDsl.QueryContainerDescriptor descriptor) + public HighlightFieldDescriptor HighlightQuery(QueryDsl.QueryDescriptor descriptor) { HighlightQueryValue = null; HighlightQueryDescriptorAction = null; @@ -199,7 +199,7 @@ public HighlightFieldDescriptor HighlightQuery(QueryDsl.QueryContaine return Self; } - public HighlightFieldDescriptor HighlightQuery(Action> configure) + public HighlightFieldDescriptor HighlightQuery(Action> configure) { HighlightQueryValue = null; HighlightQueryDescriptor = null; @@ -356,7 +356,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (HighlightQueryDescriptorAction is not null) { writer.WritePropertyName("highlight_query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(HighlightQueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(HighlightQueryDescriptorAction), options); } else if (HighlightQueryValue is not null) { @@ -513,11 +513,11 @@ public HighlightFieldDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? HighlightQueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor HighlightQueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor HighlightQueryDescriptor { get; set; } - private Action HighlightQueryDescriptorAction { get; set; } + private Action HighlightQueryDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Analysis.Analyzers? AnalyzerValue { get; set; } @@ -565,7 +565,7 @@ public HighlightFieldDescriptor() : base() private Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? TypeValue { get; set; } - public HighlightFieldDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery) + public HighlightFieldDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.Query? highlightQuery) { HighlightQueryDescriptor = null; HighlightQueryDescriptorAction = null; @@ -573,7 +573,7 @@ public HighlightFieldDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.Que return Self; } - public HighlightFieldDescriptor HighlightQuery(QueryDsl.QueryContainerDescriptor descriptor) + public HighlightFieldDescriptor HighlightQuery(QueryDsl.QueryDescriptor descriptor) { HighlightQueryValue = null; HighlightQueryDescriptorAction = null; @@ -581,7 +581,7 @@ public HighlightFieldDescriptor HighlightQuery(QueryDsl.QueryContainerDescriptor return Self; } - public HighlightFieldDescriptor HighlightQuery(Action configure) + public HighlightFieldDescriptor HighlightQuery(Action configure) { HighlightQueryValue = null; HighlightQueryDescriptor = null; @@ -738,7 +738,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (HighlightQueryDescriptorAction is not null) { writer.WritePropertyName("highlight_query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(HighlightQueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(HighlightQueryDescriptorAction), options); } else if (HighlightQueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LaplaceSmoothingModel.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LaplaceSmoothingModel.g.cs index 320f1e13a40..9db9bf5a227 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LaplaceSmoothingModel.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LaplaceSmoothingModel.g.cs @@ -31,7 +31,7 @@ public sealed partial class LaplaceSmoothingModel [JsonPropertyName("alpha")] public double Alpha { get; set; } - public static implicit operator SmoothingModelContainer(LaplaceSmoothingModel laplaceSmoothingModel) => SmoothingModelContainer.Laplace(laplaceSmoothingModel); + public static implicit operator SmoothingModel(LaplaceSmoothingModel laplaceSmoothingModel) => Core.Search.SmoothingModel.Laplace(laplaceSmoothingModel); } public sealed partial class LaplaceSmoothingModelDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LinearInterpolationSmoothingModel.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LinearInterpolationSmoothingModel.g.cs index 4583527a82f..edbc0a6f8d5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LinearInterpolationSmoothingModel.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LinearInterpolationSmoothingModel.g.cs @@ -39,7 +39,7 @@ public sealed partial class LinearInterpolationSmoothingModel [JsonPropertyName("unigram_lambda")] public double UnigramLambda { get; set; } - public static implicit operator SmoothingModelContainer(LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => SmoothingModelContainer.LinearInterpolation(linearInterpolationSmoothingModel); + public static implicit operator SmoothingModel(LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => Core.Search.SmoothingModel.LinearInterpolation(linearInterpolationSmoothingModel); } public sealed partial class LinearInterpolationSmoothingModelDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggester.g.cs index 6fde1102ad9..0e6a4844ef4 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggester.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggester.g.cs @@ -81,7 +81,7 @@ public sealed partial class PhraseSuggester [JsonInclude] [JsonPropertyName("smoothing")] - public Elastic.Clients.Elasticsearch.Core.Search.SmoothingModelContainer? Smoothing { get; set; } + public Elastic.Clients.Elasticsearch.Core.Search.SmoothingModel? Smoothing { get; set; } [JsonInclude] [JsonPropertyName("text")] @@ -91,7 +91,7 @@ public sealed partial class PhraseSuggester [JsonPropertyName("token_limit")] public int? TokenLimit { get; set; } - public static implicit operator FieldSuggester(PhraseSuggester phraseSuggester) => FieldSuggester.Phrase(phraseSuggester); + public static implicit operator FieldSuggester(PhraseSuggester phraseSuggester) => Core.Search.FieldSuggester.Phrase(phraseSuggester); } public sealed partial class PhraseSuggesterDescriptor : SerializableDescriptor> @@ -141,11 +141,11 @@ public PhraseSuggesterDescriptor() : base() private int? SizeValue { get; set; } - private Elastic.Clients.Elasticsearch.Core.Search.SmoothingModelContainer? SmoothingValue { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SmoothingModel? SmoothingValue { get; set; } - private SmoothingModelContainerDescriptor SmoothingDescriptor { get; set; } + private SmoothingModelDescriptor SmoothingDescriptor { get; set; } - private Action SmoothingDescriptorAction { get; set; } + private Action SmoothingDescriptorAction { get; set; } private string? TextValue { get; set; } @@ -301,7 +301,7 @@ public PhraseSuggesterDescriptor Size(int? size) return Self; } - public PhraseSuggesterDescriptor Smoothing(Elastic.Clients.Elasticsearch.Core.Search.SmoothingModelContainer? smoothing) + public PhraseSuggesterDescriptor Smoothing(Elastic.Clients.Elasticsearch.Core.Search.SmoothingModel? smoothing) { SmoothingDescriptor = null; SmoothingDescriptorAction = null; @@ -309,7 +309,7 @@ public PhraseSuggesterDescriptor Smoothing(Elastic.Clients.Elasticsea return Self; } - public PhraseSuggesterDescriptor Smoothing(SmoothingModelContainerDescriptor descriptor) + public PhraseSuggesterDescriptor Smoothing(SmoothingModelDescriptor descriptor) { SmoothingValue = null; SmoothingDescriptorAction = null; @@ -317,7 +317,7 @@ public PhraseSuggesterDescriptor Smoothing(SmoothingModelContainerDes return Self; } - public PhraseSuggesterDescriptor Smoothing(Action configure) + public PhraseSuggesterDescriptor Smoothing(Action configure) { SmoothingValue = null; SmoothingDescriptor = null; @@ -467,7 +467,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (SmoothingDescriptorAction is not null) { writer.WritePropertyName("smoothing"); - JsonSerializer.Serialize(writer, new SmoothingModelContainerDescriptor(SmoothingDescriptorAction), options); + JsonSerializer.Serialize(writer, new SmoothingModelDescriptor(SmoothingDescriptorAction), options); } else if (SmoothingValue is not null) { @@ -538,11 +538,11 @@ public PhraseSuggesterDescriptor() : base() private int? SizeValue { get; set; } - private Elastic.Clients.Elasticsearch.Core.Search.SmoothingModelContainer? SmoothingValue { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SmoothingModel? SmoothingValue { get; set; } - private SmoothingModelContainerDescriptor SmoothingDescriptor { get; set; } + private SmoothingModelDescriptor SmoothingDescriptor { get; set; } - private Action SmoothingDescriptorAction { get; set; } + private Action SmoothingDescriptorAction { get; set; } private string? TextValue { get; set; } @@ -704,7 +704,7 @@ public PhraseSuggesterDescriptor Size(int? size) return Self; } - public PhraseSuggesterDescriptor Smoothing(Elastic.Clients.Elasticsearch.Core.Search.SmoothingModelContainer? smoothing) + public PhraseSuggesterDescriptor Smoothing(Elastic.Clients.Elasticsearch.Core.Search.SmoothingModel? smoothing) { SmoothingDescriptor = null; SmoothingDescriptorAction = null; @@ -712,7 +712,7 @@ public PhraseSuggesterDescriptor Smoothing(Elastic.Clients.Elasticsearch.Core.Se return Self; } - public PhraseSuggesterDescriptor Smoothing(SmoothingModelContainerDescriptor descriptor) + public PhraseSuggesterDescriptor Smoothing(SmoothingModelDescriptor descriptor) { SmoothingValue = null; SmoothingDescriptorAction = null; @@ -720,7 +720,7 @@ public PhraseSuggesterDescriptor Smoothing(SmoothingModelContainerDescriptor des return Self; } - public PhraseSuggesterDescriptor Smoothing(Action configure) + public PhraseSuggesterDescriptor Smoothing(Action configure) { SmoothingValue = null; SmoothingDescriptor = null; @@ -870,7 +870,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (SmoothingDescriptorAction is not null) { writer.WritePropertyName("smoothing"); - JsonSerializer.Serialize(writer, new SmoothingModelContainerDescriptor(SmoothingDescriptorAction), options); + JsonSerializer.Serialize(writer, new SmoothingModelDescriptor(SmoothingDescriptorAction), options); } else if (SmoothingValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/RescoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/RescoreQuery.g.cs index a78cbb92472..cb43119eed7 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/RescoreQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/RescoreQuery.g.cs @@ -33,7 +33,7 @@ public sealed partial class RescoreQuery [JsonInclude] [JsonPropertyName("rescore_query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; } [JsonInclude] [JsonPropertyName("rescore_query_weight")] @@ -51,11 +51,11 @@ public RescoreQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private double? QueryWeightValue { get; set; } @@ -63,7 +63,7 @@ public RescoreQueryDescriptor() : base() private Elastic.Clients.Elasticsearch.Core.Search.ScoreMode? ScoreModeValue { get; set; } - public RescoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public RescoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -71,7 +71,7 @@ public RescoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.Que return Self; } - public RescoreQueryDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public RescoreQueryDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -79,7 +79,7 @@ public RescoreQueryDescriptor Query(QueryDsl.QueryContainerDescriptor return Self; } - public RescoreQueryDescriptor Query(Action> configure) + public RescoreQueryDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -116,7 +116,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("rescore_query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else { @@ -153,11 +153,11 @@ public RescoreQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryDsl.QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDsl.QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private double? QueryWeightValue { get; set; } @@ -165,7 +165,7 @@ public RescoreQueryDescriptor() : base() private Elastic.Clients.Elasticsearch.Core.Search.ScoreMode? ScoreModeValue { get; set; } - public RescoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public RescoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -173,7 +173,7 @@ public RescoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query return Self; } - public RescoreQueryDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor) + public RescoreQueryDescriptor Query(QueryDsl.QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -181,7 +181,7 @@ public RescoreQueryDescriptor Query(QueryDsl.QueryContainerDescriptor descriptor return Self; } - public RescoreQueryDescriptor Query(Action configure) + public RescoreQueryDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -218,7 +218,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("rescore_query"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(QueryDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModel.g.cs similarity index 58% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModel.g.cs index 20e25f39849..8816b2e2439 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModel.g.cs @@ -25,10 +25,10 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Core.Search; -[JsonConverter(typeof(SmoothingModelContainerConverter))] -public sealed partial class SmoothingModelContainer +[JsonConverter(typeof(SmoothingModelConverter))] +public sealed partial class SmoothingModel { - internal SmoothingModelContainer(string variantName, object variant) + internal SmoothingModel(string variantName, object variant) { if (variantName is null) throw new ArgumentNullException(nameof(variantName)); @@ -44,14 +44,14 @@ internal SmoothingModelContainer(string variantName, object variant) internal string VariantName { get; } - public static SmoothingModelContainer Laplace(Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel laplaceSmoothingModel) => new SmoothingModelContainer("laplace", laplaceSmoothingModel); - public static SmoothingModelContainer LinearInterpolation(Elastic.Clients.Elasticsearch.Core.Search.LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => new SmoothingModelContainer("linear_interpolation", linearInterpolationSmoothingModel); - public static SmoothingModelContainer StupidBackoff(Elastic.Clients.Elasticsearch.Core.Search.StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => new SmoothingModelContainer("stupid_backoff", stupidBackoffSmoothingModel); + public static SmoothingModel Laplace(Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel laplaceSmoothingModel) => new SmoothingModel("laplace", laplaceSmoothingModel); + public static SmoothingModel LinearInterpolation(Elastic.Clients.Elasticsearch.Core.Search.LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => new SmoothingModel("linear_interpolation", linearInterpolationSmoothingModel); + public static SmoothingModel StupidBackoff(Elastic.Clients.Elasticsearch.Core.Search.StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => new SmoothingModel("stupid_backoff", stupidBackoffSmoothingModel); } -internal sealed class SmoothingModelContainerConverter : JsonConverter +internal sealed class SmoothingModelConverter : JsonConverter { - public override SmoothingModelContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override SmoothingModel Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType != JsonTokenType.StartObject) { @@ -70,27 +70,27 @@ public override SmoothingModelContainer Read(ref Utf8JsonReader reader, Type typ { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new SmoothingModelContainer(propertyName, variant); + return new SmoothingModel(propertyName, variant); } if (propertyName == "linear_interpolation") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new SmoothingModelContainer(propertyName, variant); + return new SmoothingModel(propertyName, variant); } if (propertyName == "stupid_backoff") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new SmoothingModelContainer(propertyName, variant); + return new SmoothingModel(propertyName, variant); } throw new JsonException(); } - public override void Write(Utf8JsonWriter writer, SmoothingModelContainer value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, SmoothingModel value, JsonSerializerOptions options) { writer.WriteStartObject(); writer.WritePropertyName(value.VariantName); @@ -111,10 +111,10 @@ public override void Write(Utf8JsonWriter writer, SmoothingModelContainer value, } } -public sealed partial class SmoothingModelContainerDescriptor : SerializableDescriptor> +public sealed partial class SmoothingModelDescriptor : SerializableDescriptor> { - internal SmoothingModelContainerDescriptor(Action> configure) => configure.Invoke(this); - public SmoothingModelContainerDescriptor() : base() + internal SmoothingModelDescriptor(Action> configure) => configure.Invoke(this); + public SmoothingModelDescriptor() : base() { } @@ -126,7 +126,7 @@ public SmoothingModelContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private SmoothingModelContainerDescriptor Set(Action descriptorAction, string variantName) + private SmoothingModelDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -137,7 +137,7 @@ private SmoothingModelContainerDescriptor Set(Action descriptor return Self; } - private SmoothingModelContainerDescriptor Set(object variant, string variantName) + private SmoothingModelDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -145,12 +145,12 @@ private SmoothingModelContainerDescriptor Set(object variant, string return Self; } - public SmoothingModelContainerDescriptor Laplace(LaplaceSmoothingModel laplaceSmoothingModel) => Set(laplaceSmoothingModel, "laplace"); - public SmoothingModelContainerDescriptor Laplace(Action configure) => Set(configure, "laplace"); - public SmoothingModelContainerDescriptor LinearInterpolation(LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => Set(linearInterpolationSmoothingModel, "linear_interpolation"); - public SmoothingModelContainerDescriptor LinearInterpolation(Action configure) => Set(configure, "linear_interpolation"); - public SmoothingModelContainerDescriptor StupidBackoff(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Set(stupidBackoffSmoothingModel, "stupid_backoff"); - public SmoothingModelContainerDescriptor StupidBackoff(Action configure) => Set(configure, "stupid_backoff"); + public SmoothingModelDescriptor Laplace(LaplaceSmoothingModel laplaceSmoothingModel) => Set(laplaceSmoothingModel, "laplace"); + public SmoothingModelDescriptor Laplace(Action configure) => Set(configure, "laplace"); + public SmoothingModelDescriptor LinearInterpolation(LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => Set(linearInterpolationSmoothingModel, "linear_interpolation"); + public SmoothingModelDescriptor LinearInterpolation(Action configure) => Set(configure, "linear_interpolation"); + public SmoothingModelDescriptor StupidBackoff(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Set(stupidBackoffSmoothingModel, "stupid_backoff"); + public SmoothingModelDescriptor StupidBackoff(Action configure) => Set(configure, "stupid_backoff"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -173,10 +173,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class SmoothingModelContainerDescriptor : SerializableDescriptor +public sealed partial class SmoothingModelDescriptor : SerializableDescriptor { - internal SmoothingModelContainerDescriptor(Action configure) => configure.Invoke(this); - public SmoothingModelContainerDescriptor() : base() + internal SmoothingModelDescriptor(Action configure) => configure.Invoke(this); + public SmoothingModelDescriptor() : base() { } @@ -188,7 +188,7 @@ public SmoothingModelContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private SmoothingModelContainerDescriptor Set(Action descriptorAction, string variantName) + private SmoothingModelDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -199,7 +199,7 @@ private SmoothingModelContainerDescriptor Set(Action descriptorAction, str return Self; } - private SmoothingModelContainerDescriptor Set(object variant, string variantName) + private SmoothingModelDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -207,12 +207,12 @@ private SmoothingModelContainerDescriptor Set(object variant, string variantName return Self; } - public SmoothingModelContainerDescriptor Laplace(LaplaceSmoothingModel laplaceSmoothingModel) => Set(laplaceSmoothingModel, "laplace"); - public SmoothingModelContainerDescriptor Laplace(Action configure) => Set(configure, "laplace"); - public SmoothingModelContainerDescriptor LinearInterpolation(LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => Set(linearInterpolationSmoothingModel, "linear_interpolation"); - public SmoothingModelContainerDescriptor LinearInterpolation(Action configure) => Set(configure, "linear_interpolation"); - public SmoothingModelContainerDescriptor StupidBackoff(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Set(stupidBackoffSmoothingModel, "stupid_backoff"); - public SmoothingModelContainerDescriptor StupidBackoff(Action configure) => Set(configure, "stupid_backoff"); + public SmoothingModelDescriptor Laplace(LaplaceSmoothingModel laplaceSmoothingModel) => Set(laplaceSmoothingModel, "laplace"); + public SmoothingModelDescriptor Laplace(Action configure) => Set(configure, "laplace"); + public SmoothingModelDescriptor LinearInterpolation(LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => Set(linearInterpolationSmoothingModel, "linear_interpolation"); + public SmoothingModelDescriptor LinearInterpolation(Action configure) => Set(configure, "linear_interpolation"); + public SmoothingModelDescriptor StupidBackoff(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Set(stupidBackoffSmoothingModel, "stupid_backoff"); + public SmoothingModelDescriptor StupidBackoff(Action configure) => Set(configure, "stupid_backoff"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/StupidBackoffSmoothingModel.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/StupidBackoffSmoothingModel.g.cs index 7b293e22ecc..f3a2473eb21 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/StupidBackoffSmoothingModel.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/StupidBackoffSmoothingModel.g.cs @@ -31,7 +31,7 @@ public sealed partial class StupidBackoffSmoothingModel [JsonPropertyName("discount")] public double Discount { get; set; } - public static implicit operator SmoothingModelContainer(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => SmoothingModelContainer.StupidBackoff(stupidBackoffSmoothingModel); + public static implicit operator SmoothingModel(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Core.Search.SmoothingModel.StupidBackoff(stupidBackoffSmoothingModel); } public sealed partial class StupidBackoffSmoothingModelDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggester.g.cs index dc759e9e781..a46b12caf97 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggester.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggester.g.cs @@ -87,7 +87,7 @@ public sealed partial class TermSuggester [JsonPropertyName("text")] public string? Text { get; set; } - public static implicit operator FieldSuggester(TermSuggester termSuggester) => FieldSuggester.Term(termSuggester); + public static implicit operator FieldSuggester(TermSuggester termSuggester) => Core.Search.FieldSuggester.Term(termSuggester); } public sealed partial class TermSuggesterDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchShards/ShardStoreIndex.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchShards/ShardStoreIndex.g.cs index 444aec75879..593b60f8a4b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchShards/ShardStoreIndex.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchShards/ShardStoreIndex.g.cs @@ -33,5 +33,5 @@ public sealed partial class ShardStoreIndex [JsonInclude] [JsonPropertyName("filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Filter { get; init; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; init; } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs index 765f0bc59de..47ee4826558 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs @@ -451,174 +451,6 @@ public override void Write(Utf8JsonWriter writer, Operator value, JsonSerializer } } -[JsonConverter(typeof(RangeRelationConverter))] -public enum RangeRelation -{ - [EnumMember(Value = "within")] - Within, - [EnumMember(Value = "intersects")] - Intersects, - [EnumMember(Value = "contains")] - Contains -} - -internal sealed class RangeRelationConverter : JsonConverter -{ - public override RangeRelation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - var enumString = reader.GetString(); - switch (enumString) - { - case "within": - return RangeRelation.Within; - case "intersects": - return RangeRelation.Intersects; - case "contains": - return RangeRelation.Contains; - } - - ThrowHelper.ThrowJsonException(); - return default; - } - - public override void Write(Utf8JsonWriter writer, RangeRelation value, JsonSerializerOptions options) - { - switch (value) - { - case RangeRelation.Within: - writer.WriteStringValue("within"); - return; - case RangeRelation.Intersects: - writer.WriteStringValue("intersects"); - return; - case RangeRelation.Contains: - writer.WriteStringValue("contains"); - return; - } - - writer.WriteNullValue(); - } -} - -[JsonConverter(typeof(SimpleQueryStringFlagConverter))] -public enum SimpleQueryStringFlag -{ - [EnumMember(Value = "WHITESPACE")] - Whitespace, - [EnumMember(Value = "SLOP")] - Slop, - [EnumMember(Value = "PREFIX")] - Prefix, - [EnumMember(Value = "PRECEDENCE")] - Precedence, - [EnumMember(Value = "PHRASE")] - Phrase, - [EnumMember(Value = "OR")] - Or, - [EnumMember(Value = "NOT")] - Not, - [EnumMember(Value = "NONE")] - None, - [EnumMember(Value = "NEAR")] - Near, - [EnumMember(Value = "FUZZY")] - Fuzzy, - [EnumMember(Value = "ESCAPE")] - Escape, - [EnumMember(Value = "AND")] - And, - [EnumMember(Value = "ALL")] - All -} - -internal sealed class SimpleQueryStringFlagConverter : JsonConverter -{ - public override SimpleQueryStringFlag Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - var enumString = reader.GetString(); - switch (enumString) - { - case "WHITESPACE": - return SimpleQueryStringFlag.Whitespace; - case "SLOP": - return SimpleQueryStringFlag.Slop; - case "PREFIX": - return SimpleQueryStringFlag.Prefix; - case "PRECEDENCE": - return SimpleQueryStringFlag.Precedence; - case "PHRASE": - return SimpleQueryStringFlag.Phrase; - case "OR": - return SimpleQueryStringFlag.Or; - case "NOT": - return SimpleQueryStringFlag.Not; - case "NONE": - return SimpleQueryStringFlag.None; - case "NEAR": - return SimpleQueryStringFlag.Near; - case "FUZZY": - return SimpleQueryStringFlag.Fuzzy; - case "ESCAPE": - return SimpleQueryStringFlag.Escape; - case "AND": - return SimpleQueryStringFlag.And; - case "ALL": - return SimpleQueryStringFlag.All; - } - - ThrowHelper.ThrowJsonException(); - return default; - } - - public override void Write(Utf8JsonWriter writer, SimpleQueryStringFlag value, JsonSerializerOptions options) - { - switch (value) - { - case SimpleQueryStringFlag.Whitespace: - writer.WriteStringValue("WHITESPACE"); - return; - case SimpleQueryStringFlag.Slop: - writer.WriteStringValue("SLOP"); - return; - case SimpleQueryStringFlag.Prefix: - writer.WriteStringValue("PREFIX"); - return; - case SimpleQueryStringFlag.Precedence: - writer.WriteStringValue("PRECEDENCE"); - return; - case SimpleQueryStringFlag.Phrase: - writer.WriteStringValue("PHRASE"); - return; - case SimpleQueryStringFlag.Or: - writer.WriteStringValue("OR"); - return; - case SimpleQueryStringFlag.Not: - writer.WriteStringValue("NOT"); - return; - case SimpleQueryStringFlag.None: - writer.WriteStringValue("NONE"); - return; - case SimpleQueryStringFlag.Near: - writer.WriteStringValue("NEAR"); - return; - case SimpleQueryStringFlag.Fuzzy: - writer.WriteStringValue("FUZZY"); - return; - case SimpleQueryStringFlag.Escape: - writer.WriteStringValue("ESCAPE"); - return; - case SimpleQueryStringFlag.And: - writer.WriteStringValue("AND"); - return; - case SimpleQueryStringFlag.All: - writer.WriteStringValue("ALL"); - return; - } - - writer.WriteNullValue(); - } -} - [JsonConverter(typeof(TextQueryTypeConverter))] public enum TextQueryType { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Alias.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Alias.g.cs index 365dbec39bc..6abaf885107 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Alias.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Alias.g.cs @@ -29,7 +29,7 @@ public sealed partial class Alias { [JsonInclude] [JsonPropertyName("filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Filter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; } [JsonInclude] [JsonPropertyName("index_routing")] @@ -59,11 +59,11 @@ public AliasDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; } @@ -75,7 +75,7 @@ public AliasDescriptor() : base() private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; } - public AliasDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public AliasDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -83,7 +83,7 @@ public AliasDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl. return Self; } - public AliasDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public AliasDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -91,7 +91,7 @@ public AliasDescriptor Filter(QueryDsl.QueryContainerDescriptor Filter(Action> configure) + public AliasDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -140,7 +140,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { @@ -189,11 +189,11 @@ public AliasDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; } @@ -205,7 +205,7 @@ public AliasDescriptor() : base() private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; } - public AliasDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public AliasDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -213,7 +213,7 @@ public AliasDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContai return Self; } - public AliasDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public AliasDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -221,7 +221,7 @@ public AliasDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) return Self; } - public AliasDescriptor Filter(Action configure) + public AliasDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -270,7 +270,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AliasDefinition.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AliasDefinition.g.cs index 589885090d8..1fb1d42ce89 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AliasDefinition.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AliasDefinition.g.cs @@ -29,7 +29,7 @@ public sealed partial class AliasDefinition { [JsonInclude] [JsonPropertyName("filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Filter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; } [JsonInclude] [JsonPropertyName("index_routing")] @@ -59,11 +59,11 @@ public AliasDefinitionDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } private string? IndexRoutingValue { get; set; } @@ -75,7 +75,7 @@ public AliasDefinitionDescriptor() : base() private string? SearchRoutingValue { get; set; } - public AliasDefinitionDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public AliasDefinitionDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -83,7 +83,7 @@ public AliasDefinitionDescriptor Filter(Elastic.Clients.Elasticsearch return Self; } - public AliasDefinitionDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public AliasDefinitionDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -91,7 +91,7 @@ public AliasDefinitionDescriptor Filter(QueryDsl.QueryContainerDescri return Self; } - public AliasDefinitionDescriptor Filter(Action> configure) + public AliasDefinitionDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -140,7 +140,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { @@ -189,11 +189,11 @@ public AliasDefinitionDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } private string? IndexRoutingValue { get; set; } @@ -205,7 +205,7 @@ public AliasDefinitionDescriptor() : base() private string? SearchRoutingValue { get; set; } - public AliasDefinitionDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public AliasDefinitionDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -213,7 +213,7 @@ public AliasDefinitionDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Q return Self; } - public AliasDefinitionDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public AliasDefinitionDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -221,7 +221,7 @@ public AliasDefinitionDescriptor Filter(QueryDsl.QueryContainerDescriptor descri return Self; } - public AliasDefinitionDescriptor Filter(Action configure) + public AliasDefinitionDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -270,7 +270,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs index b17aa116a1f..ba9ae7d23c6 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs @@ -37,7 +37,7 @@ public sealed partial class KnnQuery [JsonInclude] [JsonPropertyName("filter")] - public ICollection? Filter { get; set; } + public ICollection? Filter { get; set; } [JsonInclude] [JsonPropertyName("k")] @@ -59,13 +59,13 @@ public KnnQueryDescriptor() : base() { } - private ICollection? FilterValue { get; set; } + private ICollection? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } - private Action>[] FilterDescriptorActions { get; set; } + private Action>[] FilterDescriptorActions { get; set; } private float? BoostValue { get; set; } @@ -77,7 +77,7 @@ public KnnQueryDescriptor() : base() private ICollection QueryVectorValue { get; set; } - public KnnQueryDescriptor Filter(ICollection? filter) + public KnnQueryDescriptor Filter(ICollection? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -86,7 +86,7 @@ public KnnQueryDescriptor Filter(ICollection Filter(QueryDsl.QueryContainerDescriptor descriptor) + public KnnQueryDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -95,7 +95,7 @@ public KnnQueryDescriptor Filter(QueryDsl.QueryContainerDescriptor Filter(Action> configure) + public KnnQueryDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -104,7 +104,7 @@ public KnnQueryDescriptor Filter(Action Filter(params Action>[] configure) + public KnnQueryDescriptor Filter(params Action>[] configure) { FilterValue = null; FilterDescriptor = null; @@ -163,7 +163,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("filter"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); writer.WriteEndArray(); } else if (FilterDescriptorActions is not null) @@ -172,7 +172,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in FilterDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -208,13 +208,13 @@ public KnnQueryDescriptor() : base() { } - private ICollection? FilterValue { get; set; } + private ICollection? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } - private Action[] FilterDescriptorActions { get; set; } + private Action[] FilterDescriptorActions { get; set; } private float? BoostValue { get; set; } @@ -226,7 +226,7 @@ public KnnQueryDescriptor() : base() private ICollection QueryVectorValue { get; set; } - public KnnQueryDescriptor Filter(ICollection? filter) + public KnnQueryDescriptor Filter(ICollection? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -235,7 +235,7 @@ public KnnQueryDescriptor Filter(ICollection configure) + public KnnQueryDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -253,7 +253,7 @@ public KnnQueryDescriptor Filter(Action confi return Self; } - public KnnQueryDescriptor Filter(params Action[] configure) + public KnnQueryDescriptor Filter(params Action[] configure) { FilterValue = null; FilterDescriptor = null; @@ -318,7 +318,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("filter"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); writer.WriteEndArray(); } else if (FilterDescriptorActions is not null) @@ -327,7 +327,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in FilterDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(action), options); } writer.WriteEndArray(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceOptions.g.cs index 47bf4764271..3f29b452b34 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceOptions.g.cs @@ -37,9 +37,9 @@ public sealed partial class FillMaskInferenceOptions [JsonInclude] [JsonPropertyName("tokenization")] - public Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? Tokenization { get; set; } + public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; } - public static implicit operator InferenceConfigCreateContainer(FillMaskInferenceOptions fillMaskInferenceOptions) => InferenceConfigCreateContainer.FillMask(fillMaskInferenceOptions); + public static implicit operator InferenceConfigCreate(FillMaskInferenceOptions fillMaskInferenceOptions) => Ml.InferenceConfigCreate.FillMask(fillMaskInferenceOptions); } public sealed partial class FillMaskInferenceOptionsDescriptor : SerializableDescriptor @@ -53,11 +53,11 @@ public FillMaskInferenceOptionsDescriptor() : base() private string? ResultsFieldValue { get; set; } - private Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? TokenizationValue { get; set; } + private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; } - private TokenizationConfigContainerDescriptor TokenizationDescriptor { get; set; } + private TokenizationConfigDescriptor TokenizationDescriptor { get; set; } - private Action TokenizationDescriptorAction { get; set; } + private Action TokenizationDescriptorAction { get; set; } public FillMaskInferenceOptionsDescriptor NumTopClasses(int? numTopClasses) { @@ -71,7 +71,7 @@ public FillMaskInferenceOptionsDescriptor ResultsField(string? resultsField) return Self; } - public FillMaskInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? tokenization) + public FillMaskInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization) { TokenizationDescriptor = null; TokenizationDescriptorAction = null; @@ -79,7 +79,7 @@ public FillMaskInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticse return Self; } - public FillMaskInferenceOptionsDescriptor Tokenization(TokenizationConfigContainerDescriptor descriptor) + public FillMaskInferenceOptionsDescriptor Tokenization(TokenizationConfigDescriptor descriptor) { TokenizationValue = null; TokenizationDescriptorAction = null; @@ -87,7 +87,7 @@ public FillMaskInferenceOptionsDescriptor Tokenization(TokenizationConfigContain return Self; } - public FillMaskInferenceOptionsDescriptor Tokenization(Action configure) + public FillMaskInferenceOptionsDescriptor Tokenization(Action configure) { TokenizationValue = null; TokenizationDescriptor = null; @@ -118,7 +118,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (TokenizationDescriptorAction is not null) { writer.WritePropertyName("tokenization"); - JsonSerializer.Serialize(writer, new TokenizationConfigContainerDescriptor(TokenizationDescriptorAction), options); + JsonSerializer.Serialize(writer, new TokenizationConfigDescriptor(TokenizationDescriptorAction), options); } else if (TokenizationValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceUpdateOptions.g.cs index afc7938c47e..5f2a5c073a5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceUpdateOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceUpdateOptions.g.cs @@ -39,7 +39,7 @@ public sealed partial class FillMaskInferenceUpdateOptions [JsonPropertyName("tokenization")] public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; } - public static implicit operator InferenceConfigUpdateContainer(FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => InferenceConfigUpdateContainer.FillMask(fillMaskInferenceUpdateOptions); + public static implicit operator InferenceConfigUpdate(FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => Ml.InferenceConfigUpdate.FillMask(fillMaskInferenceUpdateOptions); } public sealed partial class FillMaskInferenceUpdateOptionsDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreate.g.cs new file mode 100644 index 00000000000..7c0f338e39e --- /dev/null +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreate.g.cs @@ -0,0 +1,327 @@ +// 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. +// +// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ +// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ +// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ +// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ +// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ +// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ +// ------------------------------------------------ +// +// This file is automatically generated. +// Please do not edit these files manually. +// +// ------------------------------------------------ + +using Elastic.Clients.Elasticsearch.Fluent; +using Elastic.Clients.Elasticsearch.Serialization; +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Text.Json; +using System.Text.Json.Serialization; + +#nullable restore +namespace Elastic.Clients.Elasticsearch.Ml; +[JsonConverter(typeof(InferenceConfigCreateConverter))] +public sealed partial class InferenceConfigCreate +{ + internal InferenceConfigCreate(string variantName, object variant) + { + if (variantName is null) + throw new ArgumentNullException(nameof(variantName)); + if (variant is null) + throw new ArgumentNullException(nameof(variant)); + if (string.IsNullOrWhiteSpace(variantName)) + throw new ArgumentException("Variant name must not be empty or whitespace."); + VariantName = variantName; + Variant = variant; + } + + internal object Variant { get; } + + internal string VariantName { get; } + + public static InferenceConfigCreate Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigCreate("classification", classificationInferenceOptions); + public static InferenceConfigCreate FillMask(Elastic.Clients.Elasticsearch.Ml.FillMaskInferenceOptions fillMaskInferenceOptions) => new InferenceConfigCreate("fill_mask", fillMaskInferenceOptions); + public static InferenceConfigCreate Ner(Elastic.Clients.Elasticsearch.Ml.NerInferenceOptions nerInferenceOptions) => new InferenceConfigCreate("ner", nerInferenceOptions); + public static InferenceConfigCreate PassThrough(Elastic.Clients.Elasticsearch.Ml.PassThroughInferenceOptions passThroughInferenceOptions) => new InferenceConfigCreate("pass_through", passThroughInferenceOptions); + public static InferenceConfigCreate QuestionAnswering(Elastic.Clients.Elasticsearch.Ml.QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => new InferenceConfigCreate("question_answering", questionAnsweringInferenceOptions); + public static InferenceConfigCreate Regression(Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions regressionInferenceOptions) => new InferenceConfigCreate("regression", regressionInferenceOptions); + public static InferenceConfigCreate TextClassification(Elastic.Clients.Elasticsearch.Ml.TextClassificationInferenceOptions textClassificationInferenceOptions) => new InferenceConfigCreate("text_classification", textClassificationInferenceOptions); + public static InferenceConfigCreate TextEmbedding(Elastic.Clients.Elasticsearch.Ml.TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => new InferenceConfigCreate("text_embedding", textEmbeddingInferenceOptions); + public static InferenceConfigCreate ZeroShotClassification(Elastic.Clients.Elasticsearch.Ml.ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => new InferenceConfigCreate("zero_shot_classification", zeroShotClassificationInferenceOptions); +} + +internal sealed class InferenceConfigCreateConverter : JsonConverter +{ + public override InferenceConfigCreate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType != JsonTokenType.StartObject) + { + throw new JsonException("Expected start token."); + } + + reader.Read(); + if (reader.TokenType != JsonTokenType.PropertyName) + { + throw new JsonException("Expected a property name token representing the variant held within this container."); + } + + var propertyName = reader.GetString(); + reader.Read(); + if (propertyName == "classification") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + if (propertyName == "fill_mask") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + if (propertyName == "ner") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + if (propertyName == "pass_through") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + if (propertyName == "question_answering") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + if (propertyName == "regression") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + if (propertyName == "text_classification") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + if (propertyName == "text_embedding") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + if (propertyName == "zero_shot_classification") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigCreate(propertyName, variant); + } + + throw new JsonException(); + } + + public override void Write(Utf8JsonWriter writer, InferenceConfigCreate value, JsonSerializerOptions options) + { + writer.WriteStartObject(); + writer.WritePropertyName(value.VariantName); + switch (value.VariantName) + { + case "classification": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions)value.Variant, options); + break; + case "fill_mask": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.FillMaskInferenceOptions)value.Variant, options); + break; + case "ner": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.NerInferenceOptions)value.Variant, options); + break; + case "pass_through": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.PassThroughInferenceOptions)value.Variant, options); + break; + case "question_answering": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.QuestionAnsweringInferenceOptions)value.Variant, options); + break; + case "regression": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions)value.Variant, options); + break; + case "text_classification": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.TextClassificationInferenceOptions)value.Variant, options); + break; + case "text_embedding": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.TextEmbeddingInferenceOptions)value.Variant, options); + break; + case "zero_shot_classification": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.ZeroShotClassificationInferenceOptions)value.Variant, options); + break; + } + + writer.WriteEndObject(); + } +} + +public sealed partial class InferenceConfigCreateDescriptor : SerializableDescriptor> +{ + internal InferenceConfigCreateDescriptor(Action> configure) => configure.Invoke(this); + public InferenceConfigCreateDescriptor() : base() + { + } + + private bool ContainsVariant { get; set; } + + private string ContainedVariantName { get; set; } + + private object Variant { get; set; } + + private Descriptor Descriptor { get; set; } + + private InferenceConfigCreateDescriptor Set(Action descriptorAction, string variantName) + where T : Descriptor + { + ContainedVariantName = variantName; + ContainsVariant = true; + var descriptor = (T)Activator.CreateInstance(typeof(T), true); + descriptorAction?.Invoke(descriptor); + Descriptor = descriptor; + return Self; + } + + private InferenceConfigCreateDescriptor Set(object variant, string variantName) + { + Variant = variant; + ContainedVariantName = variantName; + ContainsVariant = true; + return Self; + } + + public InferenceConfigCreateDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); + public InferenceConfigCreateDescriptor Classification(Action configure) => Set(configure, "classification"); + public InferenceConfigCreateDescriptor FillMask(FillMaskInferenceOptions fillMaskInferenceOptions) => Set(fillMaskInferenceOptions, "fill_mask"); + public InferenceConfigCreateDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); + public InferenceConfigCreateDescriptor Ner(NerInferenceOptions nerInferenceOptions) => Set(nerInferenceOptions, "ner"); + public InferenceConfigCreateDescriptor Ner(Action configure) => Set(configure, "ner"); + public InferenceConfigCreateDescriptor PassThrough(PassThroughInferenceOptions passThroughInferenceOptions) => Set(passThroughInferenceOptions, "pass_through"); + public InferenceConfigCreateDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); + public InferenceConfigCreateDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => Set(questionAnsweringInferenceOptions, "question_answering"); + public InferenceConfigCreateDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); + public InferenceConfigCreateDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); + public InferenceConfigCreateDescriptor Regression(Action> configure) => Set(configure, "regression"); + public InferenceConfigCreateDescriptor TextClassification(TextClassificationInferenceOptions textClassificationInferenceOptions) => Set(textClassificationInferenceOptions, "text_classification"); + public InferenceConfigCreateDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); + public InferenceConfigCreateDescriptor TextEmbedding(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => Set(textEmbeddingInferenceOptions, "text_embedding"); + public InferenceConfigCreateDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); + public InferenceConfigCreateDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Set(zeroShotClassificationInferenceOptions, "zero_shot_classification"); + public InferenceConfigCreateDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); + protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) + { + if (!ContainsVariant) + { + writer.WriteNullValue(); + return; + } + + writer.WriteStartObject(); + writer.WritePropertyName(ContainedVariantName); + if (Variant is not null) + { + JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); + writer.WriteEndObject(); + return; + } + + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + } +} + +public sealed partial class InferenceConfigCreateDescriptor : SerializableDescriptor +{ + internal InferenceConfigCreateDescriptor(Action configure) => configure.Invoke(this); + public InferenceConfigCreateDescriptor() : base() + { + } + + private bool ContainsVariant { get; set; } + + private string ContainedVariantName { get; set; } + + private object Variant { get; set; } + + private Descriptor Descriptor { get; set; } + + private InferenceConfigCreateDescriptor Set(Action descriptorAction, string variantName) + where T : Descriptor + { + ContainedVariantName = variantName; + ContainsVariant = true; + var descriptor = (T)Activator.CreateInstance(typeof(T), true); + descriptorAction?.Invoke(descriptor); + Descriptor = descriptor; + return Self; + } + + private InferenceConfigCreateDescriptor Set(object variant, string variantName) + { + Variant = variant; + ContainedVariantName = variantName; + ContainsVariant = true; + return Self; + } + + public InferenceConfigCreateDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); + public InferenceConfigCreateDescriptor Classification(Action configure) => Set(configure, "classification"); + public InferenceConfigCreateDescriptor FillMask(FillMaskInferenceOptions fillMaskInferenceOptions) => Set(fillMaskInferenceOptions, "fill_mask"); + public InferenceConfigCreateDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); + public InferenceConfigCreateDescriptor Ner(NerInferenceOptions nerInferenceOptions) => Set(nerInferenceOptions, "ner"); + public InferenceConfigCreateDescriptor Ner(Action configure) => Set(configure, "ner"); + public InferenceConfigCreateDescriptor PassThrough(PassThroughInferenceOptions passThroughInferenceOptions) => Set(passThroughInferenceOptions, "pass_through"); + public InferenceConfigCreateDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); + public InferenceConfigCreateDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => Set(questionAnsweringInferenceOptions, "question_answering"); + public InferenceConfigCreateDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); + public InferenceConfigCreateDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); + public InferenceConfigCreateDescriptor Regression(Action configure) => Set(configure, "regression"); + public InferenceConfigCreateDescriptor Regression(Action> configure) => Set(configure, "regression"); + public InferenceConfigCreateDescriptor TextClassification(TextClassificationInferenceOptions textClassificationInferenceOptions) => Set(textClassificationInferenceOptions, "text_classification"); + public InferenceConfigCreateDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); + public InferenceConfigCreateDescriptor TextEmbedding(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => Set(textEmbeddingInferenceOptions, "text_embedding"); + public InferenceConfigCreateDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); + public InferenceConfigCreateDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Set(zeroShotClassificationInferenceOptions, "zero_shot_classification"); + public InferenceConfigCreateDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); + protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) + { + if (!ContainsVariant) + { + writer.WriteNullValue(); + return; + } + + writer.WriteStartObject(); + writer.WritePropertyName(ContainedVariantName); + if (Variant is not null) + { + JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); + writer.WriteEndObject(); + return; + } + + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + } +} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs deleted file mode 100644 index 96b00c47696..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs +++ /dev/null @@ -1,327 +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. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch.Ml; -[JsonConverter(typeof(InferenceConfigCreateContainerConverter))] -public sealed partial class InferenceConfigCreateContainer -{ - internal InferenceConfigCreateContainer(string variantName, object variant) - { - if (variantName is null) - throw new ArgumentNullException(nameof(variantName)); - if (variant is null) - throw new ArgumentNullException(nameof(variant)); - if (string.IsNullOrWhiteSpace(variantName)) - throw new ArgumentException("Variant name must not be empty or whitespace."); - VariantName = variantName; - Variant = variant; - } - - internal object Variant { get; } - - internal string VariantName { get; } - - public static InferenceConfigCreateContainer Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigCreateContainer("classification", classificationInferenceOptions); - public static InferenceConfigCreateContainer FillMask(Elastic.Clients.Elasticsearch.Ml.FillMaskInferenceOptions fillMaskInferenceOptions) => new InferenceConfigCreateContainer("fill_mask", fillMaskInferenceOptions); - public static InferenceConfigCreateContainer Ner(Elastic.Clients.Elasticsearch.Ml.NerInferenceOptions nerInferenceOptions) => new InferenceConfigCreateContainer("ner", nerInferenceOptions); - public static InferenceConfigCreateContainer PassThrough(Elastic.Clients.Elasticsearch.Ml.PassThroughInferenceOptions passThroughInferenceOptions) => new InferenceConfigCreateContainer("pass_through", passThroughInferenceOptions); - public static InferenceConfigCreateContainer QuestionAnswering(Elastic.Clients.Elasticsearch.Ml.QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => new InferenceConfigCreateContainer("question_answering", questionAnsweringInferenceOptions); - public static InferenceConfigCreateContainer Regression(Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions regressionInferenceOptions) => new InferenceConfigCreateContainer("regression", regressionInferenceOptions); - public static InferenceConfigCreateContainer TextClassification(Elastic.Clients.Elasticsearch.Ml.TextClassificationInferenceOptions textClassificationInferenceOptions) => new InferenceConfigCreateContainer("text_classification", textClassificationInferenceOptions); - public static InferenceConfigCreateContainer TextEmbedding(Elastic.Clients.Elasticsearch.Ml.TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => new InferenceConfigCreateContainer("text_embedding", textEmbeddingInferenceOptions); - public static InferenceConfigCreateContainer ZeroShotClassification(Elastic.Clients.Elasticsearch.Ml.ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => new InferenceConfigCreateContainer("zero_shot_classification", zeroShotClassificationInferenceOptions); -} - -internal sealed class InferenceConfigCreateContainerConverter : JsonConverter -{ - public override InferenceConfigCreateContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType != JsonTokenType.StartObject) - { - throw new JsonException("Expected start token."); - } - - reader.Read(); - if (reader.TokenType != JsonTokenType.PropertyName) - { - throw new JsonException("Expected a property name token representing the variant held within this container."); - } - - var propertyName = reader.GetString(); - reader.Read(); - if (propertyName == "classification") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - if (propertyName == "fill_mask") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - if (propertyName == "ner") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - if (propertyName == "pass_through") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - if (propertyName == "question_answering") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - if (propertyName == "regression") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - if (propertyName == "text_classification") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - if (propertyName == "text_embedding") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - if (propertyName == "zero_shot_classification") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigCreateContainer(propertyName, variant); - } - - throw new JsonException(); - } - - public override void Write(Utf8JsonWriter writer, InferenceConfigCreateContainer value, JsonSerializerOptions options) - { - writer.WriteStartObject(); - writer.WritePropertyName(value.VariantName); - switch (value.VariantName) - { - case "classification": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions)value.Variant, options); - break; - case "fill_mask": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.FillMaskInferenceOptions)value.Variant, options); - break; - case "ner": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.NerInferenceOptions)value.Variant, options); - break; - case "pass_through": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.PassThroughInferenceOptions)value.Variant, options); - break; - case "question_answering": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.QuestionAnsweringInferenceOptions)value.Variant, options); - break; - case "regression": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions)value.Variant, options); - break; - case "text_classification": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.TextClassificationInferenceOptions)value.Variant, options); - break; - case "text_embedding": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.TextEmbeddingInferenceOptions)value.Variant, options); - break; - case "zero_shot_classification": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.ZeroShotClassificationInferenceOptions)value.Variant, options); - break; - } - - writer.WriteEndObject(); - } -} - -public sealed partial class InferenceConfigCreateContainerDescriptor : SerializableDescriptor> -{ - internal InferenceConfigCreateContainerDescriptor(Action> configure) => configure.Invoke(this); - public InferenceConfigCreateContainerDescriptor() : base() - { - } - - private bool ContainsVariant { get; set; } - - private string ContainedVariantName { get; set; } - - private object Variant { get; set; } - - private Descriptor Descriptor { get; set; } - - private InferenceConfigCreateContainerDescriptor Set(Action descriptorAction, string variantName) - where T : Descriptor - { - ContainedVariantName = variantName; - ContainsVariant = true; - var descriptor = (T)Activator.CreateInstance(typeof(T), true); - descriptorAction?.Invoke(descriptor); - Descriptor = descriptor; - return Self; - } - - private InferenceConfigCreateContainerDescriptor Set(object variant, string variantName) - { - Variant = variant; - ContainedVariantName = variantName; - ContainsVariant = true; - return Self; - } - - public InferenceConfigCreateContainerDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); - public InferenceConfigCreateContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigCreateContainerDescriptor FillMask(FillMaskInferenceOptions fillMaskInferenceOptions) => Set(fillMaskInferenceOptions, "fill_mask"); - public InferenceConfigCreateContainerDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); - public InferenceConfigCreateContainerDescriptor Ner(NerInferenceOptions nerInferenceOptions) => Set(nerInferenceOptions, "ner"); - public InferenceConfigCreateContainerDescriptor Ner(Action configure) => Set(configure, "ner"); - public InferenceConfigCreateContainerDescriptor PassThrough(PassThroughInferenceOptions passThroughInferenceOptions) => Set(passThroughInferenceOptions, "pass_through"); - public InferenceConfigCreateContainerDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); - public InferenceConfigCreateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => Set(questionAnsweringInferenceOptions, "question_answering"); - public InferenceConfigCreateContainerDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); - public InferenceConfigCreateContainerDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); - public InferenceConfigCreateContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); - public InferenceConfigCreateContainerDescriptor TextClassification(TextClassificationInferenceOptions textClassificationInferenceOptions) => Set(textClassificationInferenceOptions, "text_classification"); - public InferenceConfigCreateContainerDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); - public InferenceConfigCreateContainerDescriptor TextEmbedding(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => Set(textEmbeddingInferenceOptions, "text_embedding"); - public InferenceConfigCreateContainerDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); - public InferenceConfigCreateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Set(zeroShotClassificationInferenceOptions, "zero_shot_classification"); - public InferenceConfigCreateContainerDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (!ContainsVariant) - { - writer.WriteNullValue(); - return; - } - - writer.WriteStartObject(); - writer.WritePropertyName(ContainedVariantName); - if (Variant is not null) - { - JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - writer.WriteEndObject(); - return; - } - - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); - writer.WriteEndObject(); - } -} - -public sealed partial class InferenceConfigCreateContainerDescriptor : SerializableDescriptor -{ - internal InferenceConfigCreateContainerDescriptor(Action configure) => configure.Invoke(this); - public InferenceConfigCreateContainerDescriptor() : base() - { - } - - private bool ContainsVariant { get; set; } - - private string ContainedVariantName { get; set; } - - private object Variant { get; set; } - - private Descriptor Descriptor { get; set; } - - private InferenceConfigCreateContainerDescriptor Set(Action descriptorAction, string variantName) - where T : Descriptor - { - ContainedVariantName = variantName; - ContainsVariant = true; - var descriptor = (T)Activator.CreateInstance(typeof(T), true); - descriptorAction?.Invoke(descriptor); - Descriptor = descriptor; - return Self; - } - - private InferenceConfigCreateContainerDescriptor Set(object variant, string variantName) - { - Variant = variant; - ContainedVariantName = variantName; - ContainsVariant = true; - return Self; - } - - public InferenceConfigCreateContainerDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); - public InferenceConfigCreateContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigCreateContainerDescriptor FillMask(FillMaskInferenceOptions fillMaskInferenceOptions) => Set(fillMaskInferenceOptions, "fill_mask"); - public InferenceConfigCreateContainerDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); - public InferenceConfigCreateContainerDescriptor Ner(NerInferenceOptions nerInferenceOptions) => Set(nerInferenceOptions, "ner"); - public InferenceConfigCreateContainerDescriptor Ner(Action configure) => Set(configure, "ner"); - public InferenceConfigCreateContainerDescriptor PassThrough(PassThroughInferenceOptions passThroughInferenceOptions) => Set(passThroughInferenceOptions, "pass_through"); - public InferenceConfigCreateContainerDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); - public InferenceConfigCreateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => Set(questionAnsweringInferenceOptions, "question_answering"); - public InferenceConfigCreateContainerDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); - public InferenceConfigCreateContainerDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); - public InferenceConfigCreateContainerDescriptor Regression(Action configure) => Set(configure, "regression"); - public InferenceConfigCreateContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); - public InferenceConfigCreateContainerDescriptor TextClassification(TextClassificationInferenceOptions textClassificationInferenceOptions) => Set(textClassificationInferenceOptions, "text_classification"); - public InferenceConfigCreateContainerDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); - public InferenceConfigCreateContainerDescriptor TextEmbedding(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => Set(textEmbeddingInferenceOptions, "text_embedding"); - public InferenceConfigCreateContainerDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); - public InferenceConfigCreateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Set(zeroShotClassificationInferenceOptions, "zero_shot_classification"); - public InferenceConfigCreateContainerDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (!ContainsVariant) - { - writer.WriteNullValue(); - return; - } - - writer.WriteStartObject(); - writer.WritePropertyName(ContainedVariantName); - if (Variant is not null) - { - JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - writer.WriteEndObject(); - return; - } - - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); - writer.WriteEndObject(); - } -} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdate.g.cs new file mode 100644 index 00000000000..81c6903fe8f --- /dev/null +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdate.g.cs @@ -0,0 +1,327 @@ +// 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. +// +// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ +// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ +// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ +// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ +// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ +// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ +// ------------------------------------------------ +// +// This file is automatically generated. +// Please do not edit these files manually. +// +// ------------------------------------------------ + +using Elastic.Clients.Elasticsearch.Fluent; +using Elastic.Clients.Elasticsearch.Serialization; +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Text.Json; +using System.Text.Json.Serialization; + +#nullable restore +namespace Elastic.Clients.Elasticsearch.Ml; +[JsonConverter(typeof(InferenceConfigUpdateConverter))] +public sealed partial class InferenceConfigUpdate +{ + internal InferenceConfigUpdate(string variantName, object variant) + { + if (variantName is null) + throw new ArgumentNullException(nameof(variantName)); + if (variant is null) + throw new ArgumentNullException(nameof(variant)); + if (string.IsNullOrWhiteSpace(variantName)) + throw new ArgumentException("Variant name must not be empty or whitespace."); + VariantName = variantName; + Variant = variant; + } + + internal object Variant { get; } + + internal string VariantName { get; } + + public static InferenceConfigUpdate Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigUpdate("classification", classificationInferenceOptions); + public static InferenceConfigUpdate FillMask(Elastic.Clients.Elasticsearch.Ml.FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => new InferenceConfigUpdate("fill_mask", fillMaskInferenceUpdateOptions); + public static InferenceConfigUpdate Ner(Elastic.Clients.Elasticsearch.Ml.NerInferenceUpdateOptions nerInferenceUpdateOptions) => new InferenceConfigUpdate("ner", nerInferenceUpdateOptions); + public static InferenceConfigUpdate PassThrough(Elastic.Clients.Elasticsearch.Ml.PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => new InferenceConfigUpdate("pass_through", passThroughInferenceUpdateOptions); + public static InferenceConfigUpdate QuestionAnswering(Elastic.Clients.Elasticsearch.Ml.QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => new InferenceConfigUpdate("question_answering", questionAnsweringInferenceUpdateOptions); + public static InferenceConfigUpdate Regression(Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions regressionInferenceOptions) => new InferenceConfigUpdate("regression", regressionInferenceOptions); + public static InferenceConfigUpdate TextClassification(Elastic.Clients.Elasticsearch.Ml.TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => new InferenceConfigUpdate("text_classification", textClassificationInferenceUpdateOptions); + public static InferenceConfigUpdate TextEmbedding(Elastic.Clients.Elasticsearch.Ml.TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => new InferenceConfigUpdate("text_embedding", textEmbeddingInferenceUpdateOptions); + public static InferenceConfigUpdate ZeroShotClassification(Elastic.Clients.Elasticsearch.Ml.ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => new InferenceConfigUpdate("zero_shot_classification", zeroShotClassificationInferenceUpdateOptions); +} + +internal sealed class InferenceConfigUpdateConverter : JsonConverter +{ + public override InferenceConfigUpdate Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType != JsonTokenType.StartObject) + { + throw new JsonException("Expected start token."); + } + + reader.Read(); + if (reader.TokenType != JsonTokenType.PropertyName) + { + throw new JsonException("Expected a property name token representing the variant held within this container."); + } + + var propertyName = reader.GetString(); + reader.Read(); + if (propertyName == "classification") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + if (propertyName == "fill_mask") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + if (propertyName == "ner") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + if (propertyName == "pass_through") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + if (propertyName == "question_answering") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + if (propertyName == "regression") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + if (propertyName == "text_classification") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + if (propertyName == "text_embedding") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + if (propertyName == "zero_shot_classification") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new InferenceConfigUpdate(propertyName, variant); + } + + throw new JsonException(); + } + + public override void Write(Utf8JsonWriter writer, InferenceConfigUpdate value, JsonSerializerOptions options) + { + writer.WriteStartObject(); + writer.WritePropertyName(value.VariantName); + switch (value.VariantName) + { + case "classification": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions)value.Variant, options); + break; + case "fill_mask": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.FillMaskInferenceUpdateOptions)value.Variant, options); + break; + case "ner": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.NerInferenceUpdateOptions)value.Variant, options); + break; + case "pass_through": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.PassThroughInferenceUpdateOptions)value.Variant, options); + break; + case "question_answering": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.QuestionAnsweringInferenceUpdateOptions)value.Variant, options); + break; + case "regression": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions)value.Variant, options); + break; + case "text_classification": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.TextClassificationInferenceUpdateOptions)value.Variant, options); + break; + case "text_embedding": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.TextEmbeddingInferenceUpdateOptions)value.Variant, options); + break; + case "zero_shot_classification": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.ZeroShotClassificationInferenceUpdateOptions)value.Variant, options); + break; + } + + writer.WriteEndObject(); + } +} + +public sealed partial class InferenceConfigUpdateDescriptor : SerializableDescriptor> +{ + internal InferenceConfigUpdateDescriptor(Action> configure) => configure.Invoke(this); + public InferenceConfigUpdateDescriptor() : base() + { + } + + private bool ContainsVariant { get; set; } + + private string ContainedVariantName { get; set; } + + private object Variant { get; set; } + + private Descriptor Descriptor { get; set; } + + private InferenceConfigUpdateDescriptor Set(Action descriptorAction, string variantName) + where T : Descriptor + { + ContainedVariantName = variantName; + ContainsVariant = true; + var descriptor = (T)Activator.CreateInstance(typeof(T), true); + descriptorAction?.Invoke(descriptor); + Descriptor = descriptor; + return Self; + } + + private InferenceConfigUpdateDescriptor Set(object variant, string variantName) + { + Variant = variant; + ContainedVariantName = variantName; + ContainsVariant = true; + return Self; + } + + public InferenceConfigUpdateDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); + public InferenceConfigUpdateDescriptor Classification(Action configure) => Set(configure, "classification"); + public InferenceConfigUpdateDescriptor FillMask(FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => Set(fillMaskInferenceUpdateOptions, "fill_mask"); + public InferenceConfigUpdateDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); + public InferenceConfigUpdateDescriptor Ner(NerInferenceUpdateOptions nerInferenceUpdateOptions) => Set(nerInferenceUpdateOptions, "ner"); + public InferenceConfigUpdateDescriptor Ner(Action configure) => Set(configure, "ner"); + public InferenceConfigUpdateDescriptor PassThrough(PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => Set(passThroughInferenceUpdateOptions, "pass_through"); + public InferenceConfigUpdateDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); + public InferenceConfigUpdateDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => Set(questionAnsweringInferenceUpdateOptions, "question_answering"); + public InferenceConfigUpdateDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); + public InferenceConfigUpdateDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); + public InferenceConfigUpdateDescriptor Regression(Action> configure) => Set(configure, "regression"); + public InferenceConfigUpdateDescriptor TextClassification(TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => Set(textClassificationInferenceUpdateOptions, "text_classification"); + public InferenceConfigUpdateDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); + public InferenceConfigUpdateDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => Set(textEmbeddingInferenceUpdateOptions, "text_embedding"); + public InferenceConfigUpdateDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); + public InferenceConfigUpdateDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Set(zeroShotClassificationInferenceUpdateOptions, "zero_shot_classification"); + public InferenceConfigUpdateDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); + protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) + { + if (!ContainsVariant) + { + writer.WriteNullValue(); + return; + } + + writer.WriteStartObject(); + writer.WritePropertyName(ContainedVariantName); + if (Variant is not null) + { + JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); + writer.WriteEndObject(); + return; + } + + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + } +} + +public sealed partial class InferenceConfigUpdateDescriptor : SerializableDescriptor +{ + internal InferenceConfigUpdateDescriptor(Action configure) => configure.Invoke(this); + public InferenceConfigUpdateDescriptor() : base() + { + } + + private bool ContainsVariant { get; set; } + + private string ContainedVariantName { get; set; } + + private object Variant { get; set; } + + private Descriptor Descriptor { get; set; } + + private InferenceConfigUpdateDescriptor Set(Action descriptorAction, string variantName) + where T : Descriptor + { + ContainedVariantName = variantName; + ContainsVariant = true; + var descriptor = (T)Activator.CreateInstance(typeof(T), true); + descriptorAction?.Invoke(descriptor); + Descriptor = descriptor; + return Self; + } + + private InferenceConfigUpdateDescriptor Set(object variant, string variantName) + { + Variant = variant; + ContainedVariantName = variantName; + ContainsVariant = true; + return Self; + } + + public InferenceConfigUpdateDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); + public InferenceConfigUpdateDescriptor Classification(Action configure) => Set(configure, "classification"); + public InferenceConfigUpdateDescriptor FillMask(FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => Set(fillMaskInferenceUpdateOptions, "fill_mask"); + public InferenceConfigUpdateDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); + public InferenceConfigUpdateDescriptor Ner(NerInferenceUpdateOptions nerInferenceUpdateOptions) => Set(nerInferenceUpdateOptions, "ner"); + public InferenceConfigUpdateDescriptor Ner(Action configure) => Set(configure, "ner"); + public InferenceConfigUpdateDescriptor PassThrough(PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => Set(passThroughInferenceUpdateOptions, "pass_through"); + public InferenceConfigUpdateDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); + public InferenceConfigUpdateDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => Set(questionAnsweringInferenceUpdateOptions, "question_answering"); + public InferenceConfigUpdateDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); + public InferenceConfigUpdateDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); + public InferenceConfigUpdateDescriptor Regression(Action configure) => Set(configure, "regression"); + public InferenceConfigUpdateDescriptor Regression(Action> configure) => Set(configure, "regression"); + public InferenceConfigUpdateDescriptor TextClassification(TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => Set(textClassificationInferenceUpdateOptions, "text_classification"); + public InferenceConfigUpdateDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); + public InferenceConfigUpdateDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => Set(textEmbeddingInferenceUpdateOptions, "text_embedding"); + public InferenceConfigUpdateDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); + public InferenceConfigUpdateDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Set(zeroShotClassificationInferenceUpdateOptions, "zero_shot_classification"); + public InferenceConfigUpdateDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); + protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) + { + if (!ContainsVariant) + { + writer.WriteNullValue(); + return; + } + + writer.WriteStartObject(); + writer.WritePropertyName(ContainedVariantName); + if (Variant is not null) + { + JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); + writer.WriteEndObject(); + return; + } + + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + } +} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs deleted file mode 100644 index e624ddb53e6..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs +++ /dev/null @@ -1,327 +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. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch.Ml; -[JsonConverter(typeof(InferenceConfigUpdateContainerConverter))] -public sealed partial class InferenceConfigUpdateContainer -{ - internal InferenceConfigUpdateContainer(string variantName, object variant) - { - if (variantName is null) - throw new ArgumentNullException(nameof(variantName)); - if (variant is null) - throw new ArgumentNullException(nameof(variant)); - if (string.IsNullOrWhiteSpace(variantName)) - throw new ArgumentException("Variant name must not be empty or whitespace."); - VariantName = variantName; - Variant = variant; - } - - internal object Variant { get; } - - internal string VariantName { get; } - - public static InferenceConfigUpdateContainer Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigUpdateContainer("classification", classificationInferenceOptions); - public static InferenceConfigUpdateContainer FillMask(Elastic.Clients.Elasticsearch.Ml.FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => new InferenceConfigUpdateContainer("fill_mask", fillMaskInferenceUpdateOptions); - public static InferenceConfigUpdateContainer Ner(Elastic.Clients.Elasticsearch.Ml.NerInferenceUpdateOptions nerInferenceUpdateOptions) => new InferenceConfigUpdateContainer("ner", nerInferenceUpdateOptions); - public static InferenceConfigUpdateContainer PassThrough(Elastic.Clients.Elasticsearch.Ml.PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => new InferenceConfigUpdateContainer("pass_through", passThroughInferenceUpdateOptions); - public static InferenceConfigUpdateContainer QuestionAnswering(Elastic.Clients.Elasticsearch.Ml.QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => new InferenceConfigUpdateContainer("question_answering", questionAnsweringInferenceUpdateOptions); - public static InferenceConfigUpdateContainer Regression(Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions regressionInferenceOptions) => new InferenceConfigUpdateContainer("regression", regressionInferenceOptions); - public static InferenceConfigUpdateContainer TextClassification(Elastic.Clients.Elasticsearch.Ml.TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => new InferenceConfigUpdateContainer("text_classification", textClassificationInferenceUpdateOptions); - public static InferenceConfigUpdateContainer TextEmbedding(Elastic.Clients.Elasticsearch.Ml.TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => new InferenceConfigUpdateContainer("text_embedding", textEmbeddingInferenceUpdateOptions); - public static InferenceConfigUpdateContainer ZeroShotClassification(Elastic.Clients.Elasticsearch.Ml.ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => new InferenceConfigUpdateContainer("zero_shot_classification", zeroShotClassificationInferenceUpdateOptions); -} - -internal sealed class InferenceConfigUpdateContainerConverter : JsonConverter -{ - public override InferenceConfigUpdateContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType != JsonTokenType.StartObject) - { - throw new JsonException("Expected start token."); - } - - reader.Read(); - if (reader.TokenType != JsonTokenType.PropertyName) - { - throw new JsonException("Expected a property name token representing the variant held within this container."); - } - - var propertyName = reader.GetString(); - reader.Read(); - if (propertyName == "classification") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - if (propertyName == "fill_mask") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - if (propertyName == "ner") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - if (propertyName == "pass_through") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - if (propertyName == "question_answering") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - if (propertyName == "regression") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - if (propertyName == "text_classification") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - if (propertyName == "text_embedding") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - if (propertyName == "zero_shot_classification") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new InferenceConfigUpdateContainer(propertyName, variant); - } - - throw new JsonException(); - } - - public override void Write(Utf8JsonWriter writer, InferenceConfigUpdateContainer value, JsonSerializerOptions options) - { - writer.WriteStartObject(); - writer.WritePropertyName(value.VariantName); - switch (value.VariantName) - { - case "classification": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions)value.Variant, options); - break; - case "fill_mask": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.FillMaskInferenceUpdateOptions)value.Variant, options); - break; - case "ner": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.NerInferenceUpdateOptions)value.Variant, options); - break; - case "pass_through": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.PassThroughInferenceUpdateOptions)value.Variant, options); - break; - case "question_answering": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.QuestionAnsweringInferenceUpdateOptions)value.Variant, options); - break; - case "regression": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.RegressionInferenceOptions)value.Variant, options); - break; - case "text_classification": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.TextClassificationInferenceUpdateOptions)value.Variant, options); - break; - case "text_embedding": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.TextEmbeddingInferenceUpdateOptions)value.Variant, options); - break; - case "zero_shot_classification": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Ml.ZeroShotClassificationInferenceUpdateOptions)value.Variant, options); - break; - } - - writer.WriteEndObject(); - } -} - -public sealed partial class InferenceConfigUpdateContainerDescriptor : SerializableDescriptor> -{ - internal InferenceConfigUpdateContainerDescriptor(Action> configure) => configure.Invoke(this); - public InferenceConfigUpdateContainerDescriptor() : base() - { - } - - private bool ContainsVariant { get; set; } - - private string ContainedVariantName { get; set; } - - private object Variant { get; set; } - - private Descriptor Descriptor { get; set; } - - private InferenceConfigUpdateContainerDescriptor Set(Action descriptorAction, string variantName) - where T : Descriptor - { - ContainedVariantName = variantName; - ContainsVariant = true; - var descriptor = (T)Activator.CreateInstance(typeof(T), true); - descriptorAction?.Invoke(descriptor); - Descriptor = descriptor; - return Self; - } - - private InferenceConfigUpdateContainerDescriptor Set(object variant, string variantName) - { - Variant = variant; - ContainedVariantName = variantName; - ContainsVariant = true; - return Self; - } - - public InferenceConfigUpdateContainerDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); - public InferenceConfigUpdateContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigUpdateContainerDescriptor FillMask(FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => Set(fillMaskInferenceUpdateOptions, "fill_mask"); - public InferenceConfigUpdateContainerDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); - public InferenceConfigUpdateContainerDescriptor Ner(NerInferenceUpdateOptions nerInferenceUpdateOptions) => Set(nerInferenceUpdateOptions, "ner"); - public InferenceConfigUpdateContainerDescriptor Ner(Action configure) => Set(configure, "ner"); - public InferenceConfigUpdateContainerDescriptor PassThrough(PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => Set(passThroughInferenceUpdateOptions, "pass_through"); - public InferenceConfigUpdateContainerDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); - public InferenceConfigUpdateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => Set(questionAnsweringInferenceUpdateOptions, "question_answering"); - public InferenceConfigUpdateContainerDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); - public InferenceConfigUpdateContainerDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); - public InferenceConfigUpdateContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); - public InferenceConfigUpdateContainerDescriptor TextClassification(TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => Set(textClassificationInferenceUpdateOptions, "text_classification"); - public InferenceConfigUpdateContainerDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); - public InferenceConfigUpdateContainerDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => Set(textEmbeddingInferenceUpdateOptions, "text_embedding"); - public InferenceConfigUpdateContainerDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); - public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Set(zeroShotClassificationInferenceUpdateOptions, "zero_shot_classification"); - public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (!ContainsVariant) - { - writer.WriteNullValue(); - return; - } - - writer.WriteStartObject(); - writer.WritePropertyName(ContainedVariantName); - if (Variant is not null) - { - JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - writer.WriteEndObject(); - return; - } - - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); - writer.WriteEndObject(); - } -} - -public sealed partial class InferenceConfigUpdateContainerDescriptor : SerializableDescriptor -{ - internal InferenceConfigUpdateContainerDescriptor(Action configure) => configure.Invoke(this); - public InferenceConfigUpdateContainerDescriptor() : base() - { - } - - private bool ContainsVariant { get; set; } - - private string ContainedVariantName { get; set; } - - private object Variant { get; set; } - - private Descriptor Descriptor { get; set; } - - private InferenceConfigUpdateContainerDescriptor Set(Action descriptorAction, string variantName) - where T : Descriptor - { - ContainedVariantName = variantName; - ContainsVariant = true; - var descriptor = (T)Activator.CreateInstance(typeof(T), true); - descriptorAction?.Invoke(descriptor); - Descriptor = descriptor; - return Self; - } - - private InferenceConfigUpdateContainerDescriptor Set(object variant, string variantName) - { - Variant = variant; - ContainedVariantName = variantName; - ContainsVariant = true; - return Self; - } - - public InferenceConfigUpdateContainerDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); - public InferenceConfigUpdateContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigUpdateContainerDescriptor FillMask(FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => Set(fillMaskInferenceUpdateOptions, "fill_mask"); - public InferenceConfigUpdateContainerDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); - public InferenceConfigUpdateContainerDescriptor Ner(NerInferenceUpdateOptions nerInferenceUpdateOptions) => Set(nerInferenceUpdateOptions, "ner"); - public InferenceConfigUpdateContainerDescriptor Ner(Action configure) => Set(configure, "ner"); - public InferenceConfigUpdateContainerDescriptor PassThrough(PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => Set(passThroughInferenceUpdateOptions, "pass_through"); - public InferenceConfigUpdateContainerDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); - public InferenceConfigUpdateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => Set(questionAnsweringInferenceUpdateOptions, "question_answering"); - public InferenceConfigUpdateContainerDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); - public InferenceConfigUpdateContainerDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); - public InferenceConfigUpdateContainerDescriptor Regression(Action configure) => Set(configure, "regression"); - public InferenceConfigUpdateContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); - public InferenceConfigUpdateContainerDescriptor TextClassification(TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => Set(textClassificationInferenceUpdateOptions, "text_classification"); - public InferenceConfigUpdateContainerDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); - public InferenceConfigUpdateContainerDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => Set(textEmbeddingInferenceUpdateOptions, "text_embedding"); - public InferenceConfigUpdateContainerDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); - public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Set(zeroShotClassificationInferenceUpdateOptions, "zero_shot_classification"); - public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (!ContainsVariant) - { - writer.WriteNullValue(); - return; - } - - writer.WriteStartObject(); - writer.WritePropertyName(ContainedVariantName); - if (Variant is not null) - { - JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - writer.WriteEndObject(); - return; - } - - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); - writer.WriteEndObject(); - } -} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceOptions.g.cs index bc38cd26080..758fba940b0 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceOptions.g.cs @@ -37,9 +37,9 @@ public sealed partial class NerInferenceOptions [JsonInclude] [JsonPropertyName("tokenization")] - public Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? Tokenization { get; set; } + public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; } - public static implicit operator InferenceConfigCreateContainer(NerInferenceOptions nerInferenceOptions) => InferenceConfigCreateContainer.Ner(nerInferenceOptions); + public static implicit operator InferenceConfigCreate(NerInferenceOptions nerInferenceOptions) => Ml.InferenceConfigCreate.Ner(nerInferenceOptions); } public sealed partial class NerInferenceOptionsDescriptor : SerializableDescriptor @@ -53,11 +53,11 @@ public NerInferenceOptionsDescriptor() : base() private string? ResultsFieldValue { get; set; } - private Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? TokenizationValue { get; set; } + private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; } - private TokenizationConfigContainerDescriptor TokenizationDescriptor { get; set; } + private TokenizationConfigDescriptor TokenizationDescriptor { get; set; } - private Action TokenizationDescriptorAction { get; set; } + private Action TokenizationDescriptorAction { get; set; } public NerInferenceOptionsDescriptor ClassificationLabels(ICollection? classificationLabels) { @@ -71,7 +71,7 @@ public NerInferenceOptionsDescriptor ResultsField(string? resultsField) return Self; } - public NerInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? tokenization) + public NerInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization) { TokenizationDescriptor = null; TokenizationDescriptorAction = null; @@ -79,7 +79,7 @@ public NerInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch. return Self; } - public NerInferenceOptionsDescriptor Tokenization(TokenizationConfigContainerDescriptor descriptor) + public NerInferenceOptionsDescriptor Tokenization(TokenizationConfigDescriptor descriptor) { TokenizationValue = null; TokenizationDescriptorAction = null; @@ -87,7 +87,7 @@ public NerInferenceOptionsDescriptor Tokenization(TokenizationConfigContainerDes return Self; } - public NerInferenceOptionsDescriptor Tokenization(Action configure) + public NerInferenceOptionsDescriptor Tokenization(Action configure) { TokenizationValue = null; TokenizationDescriptor = null; @@ -118,7 +118,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (TokenizationDescriptorAction is not null) { writer.WritePropertyName("tokenization"); - JsonSerializer.Serialize(writer, new TokenizationConfigContainerDescriptor(TokenizationDescriptorAction), options); + JsonSerializer.Serialize(writer, new TokenizationConfigDescriptor(TokenizationDescriptorAction), options); } else if (TokenizationValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceUpdateOptions.g.cs index 68ce6f91d39..65da43edaf6 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceUpdateOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceUpdateOptions.g.cs @@ -35,7 +35,7 @@ public sealed partial class NerInferenceUpdateOptions [JsonPropertyName("tokenization")] public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; } - public static implicit operator InferenceConfigUpdateContainer(NerInferenceUpdateOptions nerInferenceUpdateOptions) => InferenceConfigUpdateContainer.Ner(nerInferenceUpdateOptions); + public static implicit operator InferenceConfigUpdate(NerInferenceUpdateOptions nerInferenceUpdateOptions) => Ml.InferenceConfigUpdate.Ner(nerInferenceUpdateOptions); } public sealed partial class NerInferenceUpdateOptionsDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpRobertaTokenizationConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpRobertaTokenizationConfig.g.cs index 7302431bf57..5b0688bd65a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpRobertaTokenizationConfig.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpRobertaTokenizationConfig.g.cs @@ -47,7 +47,7 @@ public sealed partial class NlpRobertaTokenizationConfig [JsonPropertyName("with_special_tokens")] public bool? WithSpecialTokens { get; set; } - public static implicit operator TokenizationConfigContainer(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => TokenizationConfigContainer.Roberta(nlpRobertaTokenizationConfig); + public static implicit operator TokenizationConfig(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Ml.TokenizationConfig.Roberta(nlpRobertaTokenizationConfig); } public sealed partial class NlpRobertaTokenizationConfigDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceOptions.g.cs index c7c7d79d159..af5fd64f470 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceOptions.g.cs @@ -33,9 +33,9 @@ public sealed partial class PassThroughInferenceOptions [JsonInclude] [JsonPropertyName("tokenization")] - public Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? Tokenization { get; set; } + public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; } - public static implicit operator InferenceConfigCreateContainer(PassThroughInferenceOptions passThroughInferenceOptions) => InferenceConfigCreateContainer.PassThrough(passThroughInferenceOptions); + public static implicit operator InferenceConfigCreate(PassThroughInferenceOptions passThroughInferenceOptions) => Ml.InferenceConfigCreate.PassThrough(passThroughInferenceOptions); } public sealed partial class PassThroughInferenceOptionsDescriptor : SerializableDescriptor @@ -47,11 +47,11 @@ public PassThroughInferenceOptionsDescriptor() : base() private string? ResultsFieldValue { get; set; } - private Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? TokenizationValue { get; set; } + private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; } - private TokenizationConfigContainerDescriptor TokenizationDescriptor { get; set; } + private TokenizationConfigDescriptor TokenizationDescriptor { get; set; } - private Action TokenizationDescriptorAction { get; set; } + private Action TokenizationDescriptorAction { get; set; } public PassThroughInferenceOptionsDescriptor ResultsField(string? resultsField) { @@ -59,7 +59,7 @@ public PassThroughInferenceOptionsDescriptor ResultsField(string? resultsField) return Self; } - public PassThroughInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? tokenization) + public PassThroughInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization) { TokenizationDescriptor = null; TokenizationDescriptorAction = null; @@ -67,7 +67,7 @@ public PassThroughInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasti return Self; } - public PassThroughInferenceOptionsDescriptor Tokenization(TokenizationConfigContainerDescriptor descriptor) + public PassThroughInferenceOptionsDescriptor Tokenization(TokenizationConfigDescriptor descriptor) { TokenizationValue = null; TokenizationDescriptorAction = null; @@ -75,7 +75,7 @@ public PassThroughInferenceOptionsDescriptor Tokenization(TokenizationConfigCont return Self; } - public PassThroughInferenceOptionsDescriptor Tokenization(Action configure) + public PassThroughInferenceOptionsDescriptor Tokenization(Action configure) { TokenizationValue = null; TokenizationDescriptor = null; @@ -100,7 +100,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (TokenizationDescriptorAction is not null) { writer.WritePropertyName("tokenization"); - JsonSerializer.Serialize(writer, new TokenizationConfigContainerDescriptor(TokenizationDescriptorAction), options); + JsonSerializer.Serialize(writer, new TokenizationConfigDescriptor(TokenizationDescriptorAction), options); } else if (TokenizationValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceUpdateOptions.g.cs index 2a8a90105bf..7a7a1fe525f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceUpdateOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceUpdateOptions.g.cs @@ -35,7 +35,7 @@ public sealed partial class PassThroughInferenceUpdateOptions [JsonPropertyName("tokenization")] public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; } - public static implicit operator InferenceConfigUpdateContainer(PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => InferenceConfigUpdateContainer.PassThrough(passThroughInferenceUpdateOptions); + public static implicit operator InferenceConfigUpdate(PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => Ml.InferenceConfigUpdate.PassThrough(passThroughInferenceUpdateOptions); } public sealed partial class PassThroughInferenceUpdateOptionsDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceOptions.g.cs index 28127504867..e3b2cf303b1 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceOptions.g.cs @@ -41,9 +41,9 @@ public sealed partial class QuestionAnsweringInferenceOptions [JsonInclude] [JsonPropertyName("tokenization")] - public Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? Tokenization { get; set; } + public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; } - public static implicit operator InferenceConfigCreateContainer(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => InferenceConfigCreateContainer.QuestionAnswering(questionAnsweringInferenceOptions); + public static implicit operator InferenceConfigCreate(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => Ml.InferenceConfigCreate.QuestionAnswering(questionAnsweringInferenceOptions); } public sealed partial class QuestionAnsweringInferenceOptionsDescriptor : SerializableDescriptor @@ -59,11 +59,11 @@ public QuestionAnsweringInferenceOptionsDescriptor() : base() private string? ResultsFieldValue { get; set; } - private Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? TokenizationValue { get; set; } + private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; } - private TokenizationConfigContainerDescriptor TokenizationDescriptor { get; set; } + private TokenizationConfigDescriptor TokenizationDescriptor { get; set; } - private Action TokenizationDescriptorAction { get; set; } + private Action TokenizationDescriptorAction { get; set; } public QuestionAnsweringInferenceOptionsDescriptor MaxAnswerLength(int? maxAnswerLength) { @@ -83,7 +83,7 @@ public QuestionAnsweringInferenceOptionsDescriptor ResultsField(string? resultsF return Self; } - public QuestionAnsweringInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? tokenization) + public QuestionAnsweringInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization) { TokenizationDescriptor = null; TokenizationDescriptorAction = null; @@ -91,7 +91,7 @@ public QuestionAnsweringInferenceOptionsDescriptor Tokenization(Elastic.Clients. return Self; } - public QuestionAnsweringInferenceOptionsDescriptor Tokenization(TokenizationConfigContainerDescriptor descriptor) + public QuestionAnsweringInferenceOptionsDescriptor Tokenization(TokenizationConfigDescriptor descriptor) { TokenizationValue = null; TokenizationDescriptorAction = null; @@ -99,7 +99,7 @@ public QuestionAnsweringInferenceOptionsDescriptor Tokenization(TokenizationConf return Self; } - public QuestionAnsweringInferenceOptionsDescriptor Tokenization(Action configure) + public QuestionAnsweringInferenceOptionsDescriptor Tokenization(Action configure) { TokenizationValue = null; TokenizationDescriptor = null; @@ -136,7 +136,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (TokenizationDescriptorAction is not null) { writer.WritePropertyName("tokenization"); - JsonSerializer.Serialize(writer, new TokenizationConfigContainerDescriptor(TokenizationDescriptorAction), options); + JsonSerializer.Serialize(writer, new TokenizationConfigDescriptor(TokenizationDescriptorAction), options); } else if (TokenizationValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceUpdateOptions.g.cs index 3c95de280a9..6f3a014033b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceUpdateOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceUpdateOptions.g.cs @@ -47,7 +47,7 @@ public sealed partial class QuestionAnsweringInferenceUpdateOptions [JsonPropertyName("tokenization")] public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; } - public static implicit operator InferenceConfigUpdateContainer(QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => InferenceConfigUpdateContainer.QuestionAnswering(questionAnsweringInferenceUpdateOptions); + public static implicit operator InferenceConfigUpdate(QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => Ml.InferenceConfigUpdate.QuestionAnswering(questionAnsweringInferenceUpdateOptions); } public sealed partial class QuestionAnsweringInferenceUpdateOptionsDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceOptions.g.cs index 0ec1b28c257..affecabbc46 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceOptions.g.cs @@ -41,9 +41,9 @@ public sealed partial class TextClassificationInferenceOptions [JsonInclude] [JsonPropertyName("tokenization")] - public Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? Tokenization { get; set; } + public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; } - public static implicit operator InferenceConfigCreateContainer(TextClassificationInferenceOptions textClassificationInferenceOptions) => InferenceConfigCreateContainer.TextClassification(textClassificationInferenceOptions); + public static implicit operator InferenceConfigCreate(TextClassificationInferenceOptions textClassificationInferenceOptions) => Ml.InferenceConfigCreate.TextClassification(textClassificationInferenceOptions); } public sealed partial class TextClassificationInferenceOptionsDescriptor : SerializableDescriptor @@ -59,11 +59,11 @@ public TextClassificationInferenceOptionsDescriptor() : base() private string? ResultsFieldValue { get; set; } - private Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? TokenizationValue { get; set; } + private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; } - private TokenizationConfigContainerDescriptor TokenizationDescriptor { get; set; } + private TokenizationConfigDescriptor TokenizationDescriptor { get; set; } - private Action TokenizationDescriptorAction { get; set; } + private Action TokenizationDescriptorAction { get; set; } public TextClassificationInferenceOptionsDescriptor ClassificationLabels(ICollection? classificationLabels) { @@ -83,7 +83,7 @@ public TextClassificationInferenceOptionsDescriptor ResultsField(string? results return Self; } - public TextClassificationInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? tokenization) + public TextClassificationInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization) { TokenizationDescriptor = null; TokenizationDescriptorAction = null; @@ -91,7 +91,7 @@ public TextClassificationInferenceOptionsDescriptor Tokenization(Elastic.Clients return Self; } - public TextClassificationInferenceOptionsDescriptor Tokenization(TokenizationConfigContainerDescriptor descriptor) + public TextClassificationInferenceOptionsDescriptor Tokenization(TokenizationConfigDescriptor descriptor) { TokenizationValue = null; TokenizationDescriptorAction = null; @@ -99,7 +99,7 @@ public TextClassificationInferenceOptionsDescriptor Tokenization(TokenizationCon return Self; } - public TextClassificationInferenceOptionsDescriptor Tokenization(Action configure) + public TextClassificationInferenceOptionsDescriptor Tokenization(Action configure) { TokenizationValue = null; TokenizationDescriptor = null; @@ -136,7 +136,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (TokenizationDescriptorAction is not null) { writer.WritePropertyName("tokenization"); - JsonSerializer.Serialize(writer, new TokenizationConfigContainerDescriptor(TokenizationDescriptorAction), options); + JsonSerializer.Serialize(writer, new TokenizationConfigDescriptor(TokenizationDescriptorAction), options); } else if (TokenizationValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceUpdateOptions.g.cs index 06cea249e6f..99ea1f71bb2 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceUpdateOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceUpdateOptions.g.cs @@ -43,7 +43,7 @@ public sealed partial class TextClassificationInferenceUpdateOptions [JsonPropertyName("tokenization")] public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; } - public static implicit operator InferenceConfigUpdateContainer(TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => InferenceConfigUpdateContainer.TextClassification(textClassificationInferenceUpdateOptions); + public static implicit operator InferenceConfigUpdate(TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => Ml.InferenceConfigUpdate.TextClassification(textClassificationInferenceUpdateOptions); } public sealed partial class TextClassificationInferenceUpdateOptionsDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceOptions.g.cs index 25512eaaaa5..5e0a1647ec4 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceOptions.g.cs @@ -33,9 +33,9 @@ public sealed partial class TextEmbeddingInferenceOptions [JsonInclude] [JsonPropertyName("tokenization")] - public Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? Tokenization { get; set; } + public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; } - public static implicit operator InferenceConfigCreateContainer(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => InferenceConfigCreateContainer.TextEmbedding(textEmbeddingInferenceOptions); + public static implicit operator InferenceConfigCreate(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => Ml.InferenceConfigCreate.TextEmbedding(textEmbeddingInferenceOptions); } public sealed partial class TextEmbeddingInferenceOptionsDescriptor : SerializableDescriptor @@ -47,11 +47,11 @@ public TextEmbeddingInferenceOptionsDescriptor() : base() private string? ResultsFieldValue { get; set; } - private Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? TokenizationValue { get; set; } + private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; } - private TokenizationConfigContainerDescriptor TokenizationDescriptor { get; set; } + private TokenizationConfigDescriptor TokenizationDescriptor { get; set; } - private Action TokenizationDescriptorAction { get; set; } + private Action TokenizationDescriptorAction { get; set; } public TextEmbeddingInferenceOptionsDescriptor ResultsField(string? resultsField) { @@ -59,7 +59,7 @@ public TextEmbeddingInferenceOptionsDescriptor ResultsField(string? resultsField return Self; } - public TextEmbeddingInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? tokenization) + public TextEmbeddingInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization) { TokenizationDescriptor = null; TokenizationDescriptorAction = null; @@ -67,7 +67,7 @@ public TextEmbeddingInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elas return Self; } - public TextEmbeddingInferenceOptionsDescriptor Tokenization(TokenizationConfigContainerDescriptor descriptor) + public TextEmbeddingInferenceOptionsDescriptor Tokenization(TokenizationConfigDescriptor descriptor) { TokenizationValue = null; TokenizationDescriptorAction = null; @@ -75,7 +75,7 @@ public TextEmbeddingInferenceOptionsDescriptor Tokenization(TokenizationConfigCo return Self; } - public TextEmbeddingInferenceOptionsDescriptor Tokenization(Action configure) + public TextEmbeddingInferenceOptionsDescriptor Tokenization(Action configure) { TokenizationValue = null; TokenizationDescriptor = null; @@ -100,7 +100,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (TokenizationDescriptorAction is not null) { writer.WritePropertyName("tokenization"); - JsonSerializer.Serialize(writer, new TokenizationConfigContainerDescriptor(TokenizationDescriptorAction), options); + JsonSerializer.Serialize(writer, new TokenizationConfigDescriptor(TokenizationDescriptorAction), options); } else if (TokenizationValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceUpdateOptions.g.cs index 290053489db..97039d94c78 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceUpdateOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceUpdateOptions.g.cs @@ -35,7 +35,7 @@ public sealed partial class TextEmbeddingInferenceUpdateOptions [JsonPropertyName("tokenization")] public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; } - public static implicit operator InferenceConfigUpdateContainer(TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => InferenceConfigUpdateContainer.TextEmbedding(textEmbeddingInferenceUpdateOptions); + public static implicit operator InferenceConfigUpdate(TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => Ml.InferenceConfigUpdate.TextEmbedding(textEmbeddingInferenceUpdateOptions); } public sealed partial class TextEmbeddingInferenceUpdateOptionsDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfig.g.cs similarity index 58% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfig.g.cs index 180b27b60a7..ccfaad58084 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfig.g.cs @@ -25,10 +25,10 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.Ml; -[JsonConverter(typeof(TokenizationConfigContainerConverter))] -public sealed partial class TokenizationConfigContainer +[JsonConverter(typeof(TokenizationConfigConverter))] +public sealed partial class TokenizationConfig { - internal TokenizationConfigContainer(string variantName, object variant) + internal TokenizationConfig(string variantName, object variant) { if (variantName is null) throw new ArgumentNullException(nameof(variantName)); @@ -44,14 +44,14 @@ internal TokenizationConfigContainer(string variantName, object variant) internal string VariantName { get; } - public static TokenizationConfigContainer Bert(Elastic.Clients.Elasticsearch.Ml.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfigContainer("bert", nlpBertTokenizationConfig); - public static TokenizationConfigContainer Mpnet(Elastic.Clients.Elasticsearch.Ml.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfigContainer("mpnet", nlpBertTokenizationConfig); - public static TokenizationConfigContainer Roberta(Elastic.Clients.Elasticsearch.Ml.NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => new TokenizationConfigContainer("roberta", nlpRobertaTokenizationConfig); + public static TokenizationConfig Bert(Elastic.Clients.Elasticsearch.Ml.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfig("bert", nlpBertTokenizationConfig); + public static TokenizationConfig Mpnet(Elastic.Clients.Elasticsearch.Ml.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfig("mpnet", nlpBertTokenizationConfig); + public static TokenizationConfig Roberta(Elastic.Clients.Elasticsearch.Ml.NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => new TokenizationConfig("roberta", nlpRobertaTokenizationConfig); } -internal sealed class TokenizationConfigContainerConverter : JsonConverter +internal sealed class TokenizationConfigConverter : JsonConverter { - public override TokenizationConfigContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override TokenizationConfig Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType != JsonTokenType.StartObject) { @@ -70,27 +70,27 @@ public override TokenizationConfigContainer Read(ref Utf8JsonReader reader, Type { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new TokenizationConfigContainer(propertyName, variant); + return new TokenizationConfig(propertyName, variant); } if (propertyName == "mpnet") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new TokenizationConfigContainer(propertyName, variant); + return new TokenizationConfig(propertyName, variant); } if (propertyName == "roberta") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new TokenizationConfigContainer(propertyName, variant); + return new TokenizationConfig(propertyName, variant); } throw new JsonException(); } - public override void Write(Utf8JsonWriter writer, TokenizationConfigContainer value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, TokenizationConfig value, JsonSerializerOptions options) { writer.WriteStartObject(); writer.WritePropertyName(value.VariantName); @@ -111,10 +111,10 @@ public override void Write(Utf8JsonWriter writer, TokenizationConfigContainer va } } -public sealed partial class TokenizationConfigContainerDescriptor : SerializableDescriptor> +public sealed partial class TokenizationConfigDescriptor : SerializableDescriptor> { - internal TokenizationConfigContainerDescriptor(Action> configure) => configure.Invoke(this); - public TokenizationConfigContainerDescriptor() : base() + internal TokenizationConfigDescriptor(Action> configure) => configure.Invoke(this); + public TokenizationConfigDescriptor() : base() { } @@ -126,7 +126,7 @@ public TokenizationConfigContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private TokenizationConfigContainerDescriptor Set(Action descriptorAction, string variantName) + private TokenizationConfigDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -137,7 +137,7 @@ private TokenizationConfigContainerDescriptor Set(Action descri return Self; } - private TokenizationConfigContainerDescriptor Set(object variant, string variantName) + private TokenizationConfigDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -145,12 +145,12 @@ private TokenizationConfigContainerDescriptor Set(object variant, str return Self; } - public TokenizationConfigContainerDescriptor Bert(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "bert"); - public TokenizationConfigContainerDescriptor Bert(Action configure) => Set(configure, "bert"); - public TokenizationConfigContainerDescriptor Mpnet(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "mpnet"); - public TokenizationConfigContainerDescriptor Mpnet(Action configure) => Set(configure, "mpnet"); - public TokenizationConfigContainerDescriptor Roberta(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Set(nlpRobertaTokenizationConfig, "roberta"); - public TokenizationConfigContainerDescriptor Roberta(Action configure) => Set(configure, "roberta"); + public TokenizationConfigDescriptor Bert(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "bert"); + public TokenizationConfigDescriptor Bert(Action configure) => Set(configure, "bert"); + public TokenizationConfigDescriptor Mpnet(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "mpnet"); + public TokenizationConfigDescriptor Mpnet(Action configure) => Set(configure, "mpnet"); + public TokenizationConfigDescriptor Roberta(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Set(nlpRobertaTokenizationConfig, "roberta"); + public TokenizationConfigDescriptor Roberta(Action configure) => Set(configure, "roberta"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -173,10 +173,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class TokenizationConfigContainerDescriptor : SerializableDescriptor +public sealed partial class TokenizationConfigDescriptor : SerializableDescriptor { - internal TokenizationConfigContainerDescriptor(Action configure) => configure.Invoke(this); - public TokenizationConfigContainerDescriptor() : base() + internal TokenizationConfigDescriptor(Action configure) => configure.Invoke(this); + public TokenizationConfigDescriptor() : base() { } @@ -188,7 +188,7 @@ public TokenizationConfigContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private TokenizationConfigContainerDescriptor Set(Action descriptorAction, string variantName) + private TokenizationConfigDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -199,7 +199,7 @@ private TokenizationConfigContainerDescriptor Set(Action descriptorAction, return Self; } - private TokenizationConfigContainerDescriptor Set(object variant, string variantName) + private TokenizationConfigDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -207,12 +207,12 @@ private TokenizationConfigContainerDescriptor Set(object variant, string variant return Self; } - public TokenizationConfigContainerDescriptor Bert(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "bert"); - public TokenizationConfigContainerDescriptor Bert(Action configure) => Set(configure, "bert"); - public TokenizationConfigContainerDescriptor Mpnet(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "mpnet"); - public TokenizationConfigContainerDescriptor Mpnet(Action configure) => Set(configure, "mpnet"); - public TokenizationConfigContainerDescriptor Roberta(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Set(nlpRobertaTokenizationConfig, "roberta"); - public TokenizationConfigContainerDescriptor Roberta(Action configure) => Set(configure, "roberta"); + public TokenizationConfigDescriptor Bert(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "bert"); + public TokenizationConfigDescriptor Bert(Action configure) => Set(configure, "bert"); + public TokenizationConfigDescriptor Mpnet(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "mpnet"); + public TokenizationConfigDescriptor Mpnet(Action configure) => Set(configure, "mpnet"); + public TokenizationConfigDescriptor Roberta(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Set(nlpRobertaTokenizationConfig, "roberta"); + public TokenizationConfigDescriptor Roberta(Action configure) => Set(configure, "roberta"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceOptions.g.cs index ecaef87f497..445dec620e2 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceOptions.g.cs @@ -49,9 +49,9 @@ public sealed partial class ZeroShotClassificationInferenceOptions [JsonInclude] [JsonPropertyName("tokenization")] - public Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? Tokenization { get; set; } + public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; } - public static implicit operator InferenceConfigCreateContainer(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => InferenceConfigCreateContainer.ZeroShotClassification(zeroShotClassificationInferenceOptions); + public static implicit operator InferenceConfigCreate(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Ml.InferenceConfigCreate.ZeroShotClassification(zeroShotClassificationInferenceOptions); } public sealed partial class ZeroShotClassificationInferenceOptionsDescriptor : SerializableDescriptor @@ -71,11 +71,11 @@ public ZeroShotClassificationInferenceOptionsDescriptor() : base() private string? ResultsFieldValue { get; set; } - private Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? TokenizationValue { get; set; } + private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; } - private TokenizationConfigContainerDescriptor TokenizationDescriptor { get; set; } + private TokenizationConfigDescriptor TokenizationDescriptor { get; set; } - private Action TokenizationDescriptorAction { get; set; } + private Action TokenizationDescriptorAction { get; set; } public ZeroShotClassificationInferenceOptionsDescriptor ClassificationLabels(ICollection classificationLabels) { @@ -107,7 +107,7 @@ public ZeroShotClassificationInferenceOptionsDescriptor ResultsField(string? res return Self; } - public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfigContainer? tokenization) + public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization) { TokenizationDescriptor = null; TokenizationDescriptorAction = null; @@ -115,7 +115,7 @@ public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(Elastic.Cli return Self; } - public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(TokenizationConfigContainerDescriptor descriptor) + public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(TokenizationConfigDescriptor descriptor) { TokenizationValue = null; TokenizationDescriptorAction = null; @@ -123,7 +123,7 @@ public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(Tokenizatio return Self; } - public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(Action configure) + public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(Action configure) { TokenizationValue = null; TokenizationDescriptor = null; @@ -168,7 +168,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (TokenizationDescriptorAction is not null) { writer.WritePropertyName("tokenization"); - JsonSerializer.Serialize(writer, new TokenizationConfigContainerDescriptor(TokenizationDescriptorAction), options); + JsonSerializer.Serialize(writer, new TokenizationConfigDescriptor(TokenizationDescriptorAction), options); } else if (TokenizationValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceUpdateOptions.g.cs index 0a28d862aaf..1c535f4381a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceUpdateOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceUpdateOptions.g.cs @@ -43,7 +43,7 @@ public sealed partial class ZeroShotClassificationInferenceUpdateOptions [JsonPropertyName("tokenization")] public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; } - public static implicit operator InferenceConfigUpdateContainer(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => InferenceConfigUpdateContainer.ZeroShotClassification(zeroShotClassificationInferenceUpdateOptions); + public static implicit operator InferenceConfigUpdate(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Ml.InferenceConfigUpdate.ZeroShotClassification(zeroShotClassificationInferenceUpdateOptions); } public sealed partial class ZeroShotClassificationInferenceUpdateOptionsDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/NestedSortValue.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/NestedSortValue.g.cs index 063547c18d8..13fd31613a4 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/NestedSortValue.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/NestedSortValue.g.cs @@ -29,7 +29,7 @@ public sealed partial class NestedSortValue { [JsonInclude] [JsonPropertyName("filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Filter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; } [JsonInclude] [JsonPropertyName("max_children")] @@ -51,11 +51,11 @@ public NestedSortValueDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; } @@ -67,7 +67,7 @@ public NestedSortValueDescriptor() : base() private Elastic.Clients.Elasticsearch.Field PathValue { get; set; } - public NestedSortValueDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public NestedSortValueDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -75,7 +75,7 @@ public NestedSortValueDescriptor Filter(Elastic.Clients.Elasticsearch return Self; } - public NestedSortValueDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public NestedSortValueDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -83,7 +83,7 @@ public NestedSortValueDescriptor Filter(QueryDsl.QueryContainerDescri return Self; } - public NestedSortValueDescriptor Filter(Action> configure) + public NestedSortValueDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -144,7 +144,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { @@ -187,11 +187,11 @@ public NestedSortValueDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryDsl.QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDsl.QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; } @@ -203,7 +203,7 @@ public NestedSortValueDescriptor() : base() private Elastic.Clients.Elasticsearch.Field PathValue { get; set; } - public NestedSortValueDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public NestedSortValueDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -211,7 +211,7 @@ public NestedSortValueDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Q return Self; } - public NestedSortValueDescriptor Filter(QueryDsl.QueryContainerDescriptor descriptor) + public NestedSortValueDescriptor Filter(QueryDsl.QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -219,7 +219,7 @@ public NestedSortValueDescriptor Filter(QueryDsl.QueryContainerDescriptor descri return Self; } - public NestedSortValueDescriptor Filter(Action configure) + public NestedSortValueDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -286,7 +286,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryDsl.QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDsl.QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs index 6f517ddc6ec..c2f3b408fd2 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class BoolQuery : Query +public sealed partial class BoolQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -37,7 +37,7 @@ public sealed partial class BoolQuery : Query [JsonInclude] [JsonPropertyName("filter")] - public ICollection? Filter { get; set; } + public ICollection? Filter { get; set; } [JsonInclude] [JsonPropertyName("minimum_should_match")] @@ -45,17 +45,17 @@ public sealed partial class BoolQuery : Query [JsonInclude] [JsonPropertyName("must")] - public ICollection? Must { get; set; } + public ICollection? Must { get; set; } [JsonInclude] [JsonPropertyName("must_not")] - public ICollection? MustNot { get; set; } + public ICollection? MustNot { get; set; } [JsonInclude] [JsonPropertyName("should")] - public ICollection? Should { get; set; } + public ICollection? Should { get; set; } - public static implicit operator QueryContainer(BoolQuery boolQuery) => QueryContainer.Bool(boolQuery); + public static implicit operator Query(BoolQuery boolQuery) => QueryDsl.Query.Bool(boolQuery); } public sealed partial class BoolQueryDescriptor : SerializableDescriptor> @@ -65,37 +65,37 @@ public BoolQueryDescriptor() : base() { } - private ICollection? FilterValue { get; set; } + private ICollection? FilterValue { get; set; } - private QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } - private Action>[] FilterDescriptorActions { get; set; } + private Action>[] FilterDescriptorActions { get; set; } - private ICollection? MustValue { get; set; } + private ICollection? MustValue { get; set; } - private QueryContainerDescriptor MustDescriptor { get; set; } + private QueryDescriptor MustDescriptor { get; set; } - private Action> MustDescriptorAction { get; set; } + private Action> MustDescriptorAction { get; set; } - private Action>[] MustDescriptorActions { get; set; } + private Action>[] MustDescriptorActions { get; set; } - private ICollection? MustNotValue { get; set; } + private ICollection? MustNotValue { get; set; } - private QueryContainerDescriptor MustNotDescriptor { get; set; } + private QueryDescriptor MustNotDescriptor { get; set; } - private Action> MustNotDescriptorAction { get; set; } + private Action> MustNotDescriptorAction { get; set; } - private Action>[] MustNotDescriptorActions { get; set; } + private Action>[] MustNotDescriptorActions { get; set; } - private ICollection? ShouldValue { get; set; } + private ICollection? ShouldValue { get; set; } - private QueryContainerDescriptor ShouldDescriptor { get; set; } + private QueryDescriptor ShouldDescriptor { get; set; } - private Action> ShouldDescriptorAction { get; set; } + private Action> ShouldDescriptorAction { get; set; } - private Action>[] ShouldDescriptorActions { get; set; } + private Action>[] ShouldDescriptorActions { get; set; } private string? QueryNameValue { get; set; } @@ -103,7 +103,7 @@ public BoolQueryDescriptor() : base() private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; } - public BoolQueryDescriptor Filter(ICollection? filter) + public BoolQueryDescriptor Filter(ICollection? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -112,7 +112,7 @@ public BoolQueryDescriptor Filter(ICollection Filter(QueryContainerDescriptor descriptor) + public BoolQueryDescriptor Filter(QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -121,7 +121,7 @@ public BoolQueryDescriptor Filter(QueryContainerDescriptor return Self; } - public BoolQueryDescriptor Filter(Action> configure) + public BoolQueryDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -130,7 +130,7 @@ public BoolQueryDescriptor Filter(Action Filter(params Action>[] configure) + public BoolQueryDescriptor Filter(params Action>[] configure) { FilterValue = null; FilterDescriptor = null; @@ -139,7 +139,7 @@ public BoolQueryDescriptor Filter(params Action Must(ICollection? must) + public BoolQueryDescriptor Must(ICollection? must) { MustDescriptor = null; MustDescriptorAction = null; @@ -148,7 +148,7 @@ public BoolQueryDescriptor Must(ICollection Must(QueryContainerDescriptor descriptor) + public BoolQueryDescriptor Must(QueryDescriptor descriptor) { MustValue = null; MustDescriptorAction = null; @@ -157,7 +157,7 @@ public BoolQueryDescriptor Must(QueryContainerDescriptor d return Self; } - public BoolQueryDescriptor Must(Action> configure) + public BoolQueryDescriptor Must(Action> configure) { MustValue = null; MustDescriptor = null; @@ -166,7 +166,7 @@ public BoolQueryDescriptor Must(Action Must(params Action>[] configure) + public BoolQueryDescriptor Must(params Action>[] configure) { MustValue = null; MustDescriptor = null; @@ -175,7 +175,7 @@ public BoolQueryDescriptor Must(params Action MustNot(ICollection? mustNot) + public BoolQueryDescriptor MustNot(ICollection? mustNot) { MustNotDescriptor = null; MustNotDescriptorAction = null; @@ -184,7 +184,7 @@ public BoolQueryDescriptor MustNot(ICollection MustNot(QueryContainerDescriptor descriptor) + public BoolQueryDescriptor MustNot(QueryDescriptor descriptor) { MustNotValue = null; MustNotDescriptorAction = null; @@ -193,7 +193,7 @@ public BoolQueryDescriptor MustNot(QueryContainerDescriptor MustNot(Action> configure) + public BoolQueryDescriptor MustNot(Action> configure) { MustNotValue = null; MustNotDescriptor = null; @@ -202,7 +202,7 @@ public BoolQueryDescriptor MustNot(Action MustNot(params Action>[] configure) + public BoolQueryDescriptor MustNot(params Action>[] configure) { MustNotValue = null; MustNotDescriptor = null; @@ -211,7 +211,7 @@ public BoolQueryDescriptor MustNot(params Action Should(ICollection? should) + public BoolQueryDescriptor Should(ICollection? should) { ShouldDescriptor = null; ShouldDescriptorAction = null; @@ -220,7 +220,7 @@ public BoolQueryDescriptor Should(ICollection Should(QueryContainerDescriptor descriptor) + public BoolQueryDescriptor Should(QueryDescriptor descriptor) { ShouldValue = null; ShouldDescriptorAction = null; @@ -229,7 +229,7 @@ public BoolQueryDescriptor Should(QueryContainerDescriptor return Self; } - public BoolQueryDescriptor Should(Action> configure) + public BoolQueryDescriptor Should(Action> configure) { ShouldValue = null; ShouldDescriptor = null; @@ -238,7 +238,7 @@ public BoolQueryDescriptor Should(Action Should(params Action>[] configure) + public BoolQueryDescriptor Should(params Action>[] configure) { ShouldValue = null; ShouldDescriptor = null; @@ -279,7 +279,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("filter"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(FilterDescriptorAction), options); writer.WriteEndArray(); } else if (FilterDescriptorActions is not null) @@ -288,7 +288,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in FilterDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -310,7 +310,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("must"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(MustDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(MustDescriptorAction), options); writer.WriteEndArray(); } else if (MustDescriptorActions is not null) @@ -319,7 +319,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in MustDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -341,7 +341,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("must_not"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(MustNotDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(MustNotDescriptorAction), options); writer.WriteEndArray(); } else if (MustNotDescriptorActions is not null) @@ -350,7 +350,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in MustNotDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -372,7 +372,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("should"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(ShouldDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(ShouldDescriptorAction), options); writer.WriteEndArray(); } else if (ShouldDescriptorActions is not null) @@ -381,7 +381,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in ShouldDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -421,37 +421,37 @@ public BoolQueryDescriptor() : base() { } - private ICollection? FilterValue { get; set; } + private ICollection? FilterValue { get; set; } - private QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } - private Action[] FilterDescriptorActions { get; set; } + private Action[] FilterDescriptorActions { get; set; } - private ICollection? MustValue { get; set; } + private ICollection? MustValue { get; set; } - private QueryContainerDescriptor MustDescriptor { get; set; } + private QueryDescriptor MustDescriptor { get; set; } - private Action MustDescriptorAction { get; set; } + private Action MustDescriptorAction { get; set; } - private Action[] MustDescriptorActions { get; set; } + private Action[] MustDescriptorActions { get; set; } - private ICollection? MustNotValue { get; set; } + private ICollection? MustNotValue { get; set; } - private QueryContainerDescriptor MustNotDescriptor { get; set; } + private QueryDescriptor MustNotDescriptor { get; set; } - private Action MustNotDescriptorAction { get; set; } + private Action MustNotDescriptorAction { get; set; } - private Action[] MustNotDescriptorActions { get; set; } + private Action[] MustNotDescriptorActions { get; set; } - private ICollection? ShouldValue { get; set; } + private ICollection? ShouldValue { get; set; } - private QueryContainerDescriptor ShouldDescriptor { get; set; } + private QueryDescriptor ShouldDescriptor { get; set; } - private Action ShouldDescriptorAction { get; set; } + private Action ShouldDescriptorAction { get; set; } - private Action[] ShouldDescriptorActions { get; set; } + private Action[] ShouldDescriptorActions { get; set; } private string? QueryNameValue { get; set; } @@ -459,7 +459,7 @@ public BoolQueryDescriptor() : base() private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; } - public BoolQueryDescriptor Filter(ICollection? filter) + public BoolQueryDescriptor Filter(ICollection? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -468,7 +468,7 @@ public BoolQueryDescriptor Filter(ICollection configure) + public BoolQueryDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -486,7 +486,7 @@ public BoolQueryDescriptor Filter(Action configure) return Self; } - public BoolQueryDescriptor Filter(params Action[] configure) + public BoolQueryDescriptor Filter(params Action[] configure) { FilterValue = null; FilterDescriptor = null; @@ -495,7 +495,7 @@ public BoolQueryDescriptor Filter(params Action[] conf return Self; } - public BoolQueryDescriptor Must(ICollection? must) + public BoolQueryDescriptor Must(ICollection? must) { MustDescriptor = null; MustDescriptorAction = null; @@ -504,7 +504,7 @@ public BoolQueryDescriptor Must(ICollection configure) + public BoolQueryDescriptor Must(Action configure) { MustValue = null; MustDescriptor = null; @@ -522,7 +522,7 @@ public BoolQueryDescriptor Must(Action configure) return Self; } - public BoolQueryDescriptor Must(params Action[] configure) + public BoolQueryDescriptor Must(params Action[] configure) { MustValue = null; MustDescriptor = null; @@ -531,7 +531,7 @@ public BoolQueryDescriptor Must(params Action[] config return Self; } - public BoolQueryDescriptor MustNot(ICollection? mustNot) + public BoolQueryDescriptor MustNot(ICollection? mustNot) { MustNotDescriptor = null; MustNotDescriptorAction = null; @@ -540,7 +540,7 @@ public BoolQueryDescriptor MustNot(ICollection configure) + public BoolQueryDescriptor MustNot(Action configure) { MustNotValue = null; MustNotDescriptor = null; @@ -558,7 +558,7 @@ public BoolQueryDescriptor MustNot(Action configure) return Self; } - public BoolQueryDescriptor MustNot(params Action[] configure) + public BoolQueryDescriptor MustNot(params Action[] configure) { MustNotValue = null; MustNotDescriptor = null; @@ -567,7 +567,7 @@ public BoolQueryDescriptor MustNot(params Action[] con return Self; } - public BoolQueryDescriptor Should(ICollection? should) + public BoolQueryDescriptor Should(ICollection? should) { ShouldDescriptor = null; ShouldDescriptorAction = null; @@ -576,7 +576,7 @@ public BoolQueryDescriptor Should(ICollection configure) + public BoolQueryDescriptor Should(Action configure) { ShouldValue = null; ShouldDescriptor = null; @@ -594,7 +594,7 @@ public BoolQueryDescriptor Should(Action configure) return Self; } - public BoolQueryDescriptor Should(params Action[] configure) + public BoolQueryDescriptor Should(params Action[] configure) { ShouldValue = null; ShouldDescriptor = null; @@ -635,7 +635,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("filter"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(FilterDescriptorAction), options); writer.WriteEndArray(); } else if (FilterDescriptorActions is not null) @@ -644,7 +644,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in FilterDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -666,7 +666,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("must"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(MustDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(MustDescriptorAction), options); writer.WriteEndArray(); } else if (MustDescriptorActions is not null) @@ -675,7 +675,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in MustDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -697,7 +697,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("must_not"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(MustNotDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(MustNotDescriptorAction), options); writer.WriteEndArray(); } else if (MustNotDescriptorActions is not null) @@ -706,7 +706,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in MustNotDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -728,7 +728,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("should"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(ShouldDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(ShouldDescriptorAction), options); writer.WriteEndArray(); } else if (ShouldDescriptorActions is not null) @@ -737,7 +737,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in ShouldDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoostingQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoostingQuery.g.cs index cdb899a627d..260813edd7b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoostingQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoostingQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class BoostingQuery : Query +public sealed partial class BoostingQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -37,7 +37,7 @@ public sealed partial class BoostingQuery : Query [JsonInclude] [JsonPropertyName("negative")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Negative { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Negative { get; set; } [JsonInclude] [JsonPropertyName("negative_boost")] @@ -45,9 +45,9 @@ public sealed partial class BoostingQuery : Query [JsonInclude] [JsonPropertyName("positive")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Positive { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Positive { get; set; } - public static implicit operator QueryContainer(BoostingQuery boostingQuery) => QueryContainer.Boosting(boostingQuery); + public static implicit operator Query(BoostingQuery boostingQuery) => QueryDsl.Query.Boosting(boostingQuery); } public sealed partial class BoostingQueryDescriptor : SerializableDescriptor> @@ -57,17 +57,17 @@ public BoostingQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer NegativeValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query NegativeValue { get; set; } - private QueryContainerDescriptor NegativeDescriptor { get; set; } + private QueryDescriptor NegativeDescriptor { get; set; } - private Action> NegativeDescriptorAction { get; set; } + private Action> NegativeDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer PositiveValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query PositiveValue { get; set; } - private QueryContainerDescriptor PositiveDescriptor { get; set; } + private QueryDescriptor PositiveDescriptor { get; set; } - private Action> PositiveDescriptorAction { get; set; } + private Action> PositiveDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -75,7 +75,7 @@ public BoostingQueryDescriptor() : base() private double NegativeBoostValue { get; set; } - public BoostingQueryDescriptor Negative(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer negative) + public BoostingQueryDescriptor Negative(Elastic.Clients.Elasticsearch.QueryDsl.Query negative) { NegativeDescriptor = null; NegativeDescriptorAction = null; @@ -83,7 +83,7 @@ public BoostingQueryDescriptor Negative(Elastic.Clients.Elasticsearch return Self; } - public BoostingQueryDescriptor Negative(QueryContainerDescriptor descriptor) + public BoostingQueryDescriptor Negative(QueryDescriptor descriptor) { NegativeValue = null; NegativeDescriptorAction = null; @@ -91,7 +91,7 @@ public BoostingQueryDescriptor Negative(QueryContainerDescriptor Negative(Action> configure) + public BoostingQueryDescriptor Negative(Action> configure) { NegativeValue = null; NegativeDescriptor = null; @@ -99,7 +99,7 @@ public BoostingQueryDescriptor Negative(Action Positive(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer positive) + public BoostingQueryDescriptor Positive(Elastic.Clients.Elasticsearch.QueryDsl.Query positive) { PositiveDescriptor = null; PositiveDescriptorAction = null; @@ -107,7 +107,7 @@ public BoostingQueryDescriptor Positive(Elastic.Clients.Elasticsearch return Self; } - public BoostingQueryDescriptor Positive(QueryContainerDescriptor descriptor) + public BoostingQueryDescriptor Positive(QueryDescriptor descriptor) { PositiveValue = null; PositiveDescriptorAction = null; @@ -115,7 +115,7 @@ public BoostingQueryDescriptor Positive(QueryContainerDescriptor Positive(Action> configure) + public BoostingQueryDescriptor Positive(Action> configure) { PositiveValue = null; PositiveDescriptor = null; @@ -152,7 +152,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (NegativeDescriptorAction is not null) { writer.WritePropertyName("negative"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(NegativeDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(NegativeDescriptorAction), options); } else { @@ -168,7 +168,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (PositiveDescriptorAction is not null) { writer.WritePropertyName("positive"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(PositiveDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(PositiveDescriptorAction), options); } else { @@ -201,17 +201,17 @@ public BoostingQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer NegativeValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query NegativeValue { get; set; } - private QueryContainerDescriptor NegativeDescriptor { get; set; } + private QueryDescriptor NegativeDescriptor { get; set; } - private Action NegativeDescriptorAction { get; set; } + private Action NegativeDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer PositiveValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query PositiveValue { get; set; } - private QueryContainerDescriptor PositiveDescriptor { get; set; } + private QueryDescriptor PositiveDescriptor { get; set; } - private Action PositiveDescriptorAction { get; set; } + private Action PositiveDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -219,7 +219,7 @@ public BoostingQueryDescriptor() : base() private double NegativeBoostValue { get; set; } - public BoostingQueryDescriptor Negative(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer negative) + public BoostingQueryDescriptor Negative(Elastic.Clients.Elasticsearch.QueryDsl.Query negative) { NegativeDescriptor = null; NegativeDescriptorAction = null; @@ -227,7 +227,7 @@ public BoostingQueryDescriptor Negative(Elastic.Clients.Elasticsearch.QueryDsl.Q return Self; } - public BoostingQueryDescriptor Negative(QueryContainerDescriptor descriptor) + public BoostingQueryDescriptor Negative(QueryDescriptor descriptor) { NegativeValue = null; NegativeDescriptorAction = null; @@ -235,7 +235,7 @@ public BoostingQueryDescriptor Negative(QueryContainerDescriptor descriptor) return Self; } - public BoostingQueryDescriptor Negative(Action configure) + public BoostingQueryDescriptor Negative(Action configure) { NegativeValue = null; NegativeDescriptor = null; @@ -243,7 +243,7 @@ public BoostingQueryDescriptor Negative(Action configu return Self; } - public BoostingQueryDescriptor Positive(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer positive) + public BoostingQueryDescriptor Positive(Elastic.Clients.Elasticsearch.QueryDsl.Query positive) { PositiveDescriptor = null; PositiveDescriptorAction = null; @@ -251,7 +251,7 @@ public BoostingQueryDescriptor Positive(Elastic.Clients.Elasticsearch.QueryDsl.Q return Self; } - public BoostingQueryDescriptor Positive(QueryContainerDescriptor descriptor) + public BoostingQueryDescriptor Positive(QueryDescriptor descriptor) { PositiveValue = null; PositiveDescriptorAction = null; @@ -259,7 +259,7 @@ public BoostingQueryDescriptor Positive(QueryContainerDescriptor descriptor) return Self; } - public BoostingQueryDescriptor Positive(Action configure) + public BoostingQueryDescriptor Positive(Action configure) { PositiveValue = null; PositiveDescriptor = null; @@ -296,7 +296,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (NegativeDescriptorAction is not null) { writer.WritePropertyName("negative"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(NegativeDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(NegativeDescriptorAction), options); } else { @@ -312,7 +312,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (PositiveDescriptorAction is not null) { writer.WritePropertyName("positive"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(PositiveDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(PositiveDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs index 5cf5b7e8f5f..a62b337f05e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class CombinedFieldsQuery : Query +public sealed partial class CombinedFieldsQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -59,7 +59,7 @@ public sealed partial class CombinedFieldsQuery : Query [JsonPropertyName("zero_terms_query")] public Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsZeroTerms? ZeroTermsQuery { get; set; } - public static implicit operator QueryContainer(CombinedFieldsQuery combinedFieldsQuery) => QueryContainer.CombinedFields(combinedFieldsQuery); + public static implicit operator Query(CombinedFieldsQuery combinedFieldsQuery) => QueryDsl.Query.CombinedFields(combinedFieldsQuery); } public sealed partial class CombinedFieldsQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ConstantScoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ConstantScoreQuery.g.cs index 6fae15fd4d2..9b162e5deaf 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ConstantScoreQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ConstantScoreQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class ConstantScoreQuery : Query +public sealed partial class ConstantScoreQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -37,9 +37,9 @@ public sealed partial class ConstantScoreQuery : Query [JsonInclude] [JsonPropertyName("filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Filter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Filter { get; set; } - public static implicit operator QueryContainer(ConstantScoreQuery constantScoreQuery) => QueryContainer.ConstantScore(constantScoreQuery); + public static implicit operator Query(ConstantScoreQuery constantScoreQuery) => QueryDsl.Query.ConstantScore(constantScoreQuery); } public sealed partial class ConstantScoreQueryDescriptor : SerializableDescriptor> @@ -49,17 +49,17 @@ public ConstantScoreQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query FilterValue { get; set; } - private QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } private string? QueryNameValue { get; set; } private float? BoostValue { get; set; } - public ConstantScoreQueryDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer filter) + public ConstantScoreQueryDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -67,7 +67,7 @@ public ConstantScoreQueryDescriptor Filter(Elastic.Clients.Elasticsea return Self; } - public ConstantScoreQueryDescriptor Filter(QueryContainerDescriptor descriptor) + public ConstantScoreQueryDescriptor Filter(QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -75,7 +75,7 @@ public ConstantScoreQueryDescriptor Filter(QueryContainerDescriptor Filter(Action> configure) + public ConstantScoreQueryDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -106,7 +106,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(FilterDescriptorAction), options); } else { @@ -137,17 +137,17 @@ public ConstantScoreQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query FilterValue { get; set; } - private QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } private string? QueryNameValue { get; set; } private float? BoostValue { get; set; } - public ConstantScoreQueryDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer filter) + public ConstantScoreQueryDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -155,7 +155,7 @@ public ConstantScoreQueryDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDs return Self; } - public ConstantScoreQueryDescriptor Filter(QueryContainerDescriptor descriptor) + public ConstantScoreQueryDescriptor Filter(QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -163,7 +163,7 @@ public ConstantScoreQueryDescriptor Filter(QueryContainerDescriptor descriptor) return Self; } - public ConstantScoreQueryDescriptor Filter(Action configure) + public ConstantScoreQueryDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -194,7 +194,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(FilterDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs deleted file mode 100644 index d59671911fa..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs +++ /dev/null @@ -1,635 +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. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch.QueryDsl; -internal sealed class DateRangeQueryConverter : JsonConverter -{ - public override DateRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType != JsonTokenType.StartObject) - throw new JsonException("Unexpected JSON detected."); - reader.Read(); - var fieldName = reader.GetString(); - reader.Read(); - var variant = new DateRangeQuery(fieldName); - while (reader.Read() && reader.TokenType != JsonTokenType.EndObject) - { - if (reader.TokenType == JsonTokenType.PropertyName) - { - var property = reader.GetString(); - if (property == "_name") - { - variant.QueryName = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "boost") - { - variant.Boost = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "format") - { - variant.Format = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "from") - { - variant.From = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "gt") - { - variant.Gt = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "gte") - { - variant.Gte = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "lt") - { - variant.Lt = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "lte") - { - variant.Lte = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "relation") - { - variant.Relation = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "time_zone") - { - variant.TimeZone = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "to") - { - variant.To = JsonSerializer.Deserialize(ref reader, options); - continue; - } - } - } - - reader.Read(); - return variant; - } - - public override void Write(Utf8JsonWriter writer, DateRangeQuery value, JsonSerializerOptions options) - { - if (value.Field is null) - throw new JsonException("Unable to serialize DateRangeQuery because the `Field` property is not set. Field name queries must include a valid field name."); - if (options.TryGetClientSettings(out var settings)) - { - writer.WriteStartObject(); - writer.WritePropertyName(settings.Inferrer.Field(value.Field)); - writer.WriteStartObject(); - if (!string.IsNullOrEmpty(value.QueryName)) - { - writer.WritePropertyName("_name"); - writer.WriteStringValue(value.QueryName); - } - - if (value.Boost.HasValue) - { - writer.WritePropertyName("boost"); - writer.WriteNumberValue(value.Boost.Value); - } - - if (value.Format is not null) - { - writer.WritePropertyName("format"); - JsonSerializer.Serialize(writer, value.Format, options); - } - - if (value.From is not null) - { - writer.WritePropertyName("from"); - JsonSerializer.Serialize(writer, value.From, options); - } - - if (value.Gt is not null) - { - writer.WritePropertyName("gt"); - JsonSerializer.Serialize(writer, value.Gt, options); - } - - if (value.Gte is not null) - { - writer.WritePropertyName("gte"); - JsonSerializer.Serialize(writer, value.Gte, options); - } - - if (value.Lt is not null) - { - writer.WritePropertyName("lt"); - JsonSerializer.Serialize(writer, value.Lt, options); - } - - if (value.Lte is not null) - { - writer.WritePropertyName("lte"); - JsonSerializer.Serialize(writer, value.Lte, options); - } - - if (value.Relation is not null) - { - writer.WritePropertyName("relation"); - JsonSerializer.Serialize(writer, value.Relation, options); - } - - if (value.TimeZone is not null) - { - writer.WritePropertyName("time_zone"); - JsonSerializer.Serialize(writer, value.TimeZone, options); - } - - if (value.To is not null) - { - writer.WritePropertyName("to"); - JsonSerializer.Serialize(writer, value.To, options); - } - - writer.WriteEndObject(); - writer.WriteEndObject(); - return; - } - - throw new JsonException("Unable to retrieve client settings required to infer field."); - } -} - -[JsonConverter(typeof(DateRangeQueryConverter))] -public sealed partial class DateRangeQuery : Query -{ - public DateRangeQuery(Field field) - { - if (field is null) - throw new ArgumentNullException(nameof(field)); - Field = field; - } - - public string? QueryName { get; set; } - - public float? Boost { get; set; } - - public string? Format { get; set; } - - public Elastic.Clients.Elasticsearch.DateMath? From { get; set; } - - public Elastic.Clients.Elasticsearch.DateMath? Gt { get; set; } - - public Elastic.Clients.Elasticsearch.DateMath? Gte { get; set; } - - public Elastic.Clients.Elasticsearch.DateMath? Lt { get; set; } - - public Elastic.Clients.Elasticsearch.DateMath? Lte { get; set; } - - public Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? Relation { get; set; } - - public string? TimeZone { get; set; } - - public Elastic.Clients.Elasticsearch.DateMath? To { get; set; } - - public Elastic.Clients.Elasticsearch.Field Field { get; set; } - - public static implicit operator QueryContainer(DateRangeQuery dateRangeQuery) => QueryContainer.Range(new RangeQuery(dateRangeQuery)); -} - -public sealed partial class DateRangeQueryDescriptor : SerializableDescriptor> -{ - internal DateRangeQueryDescriptor(Action> configure) => configure.Invoke(this); - internal DateRangeQueryDescriptor() : base() - { - } - - public DateRangeQueryDescriptor(Field field) - { - if (field is null) - throw new ArgumentNullException(nameof(field)); - FieldValue = field; - } - - public DateRangeQueryDescriptor(Expression> field) - { - if (field is null) - throw new ArgumentNullException(nameof(field)); - FieldValue = field; - } - - private string? QueryNameValue { get; set; } - - private float? BoostValue { get; set; } - - private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; } - - private string? FormatValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? FromValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? GtValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? GteValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? LtValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? LteValue { get; set; } - - private Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? RelationValue { get; set; } - - private string? TimeZoneValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? ToValue { get; set; } - - public DateRangeQueryDescriptor QueryName(string? queryName) - { - QueryNameValue = queryName; - return Self; - } - - public DateRangeQueryDescriptor Boost(float? boost) - { - BoostValue = boost; - return Self; - } - - public DateRangeQueryDescriptor Field(Elastic.Clients.Elasticsearch.Field field) - { - FieldValue = field; - return Self; - } - - public DateRangeQueryDescriptor Field(Expression> field) - { - FieldValue = field; - return Self; - } - - public DateRangeQueryDescriptor Format(string? format) - { - FormatValue = format; - return Self; - } - - public DateRangeQueryDescriptor From(Elastic.Clients.Elasticsearch.DateMath? from) - { - FromValue = from; - return Self; - } - - public DateRangeQueryDescriptor Gt(Elastic.Clients.Elasticsearch.DateMath? gt) - { - GtValue = gt; - return Self; - } - - public DateRangeQueryDescriptor Gte(Elastic.Clients.Elasticsearch.DateMath? gte) - { - GteValue = gte; - return Self; - } - - public DateRangeQueryDescriptor Lt(Elastic.Clients.Elasticsearch.DateMath? lt) - { - LtValue = lt; - return Self; - } - - public DateRangeQueryDescriptor Lte(Elastic.Clients.Elasticsearch.DateMath? lte) - { - LteValue = lte; - return Self; - } - - public DateRangeQueryDescriptor Relation(Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? relation) - { - RelationValue = relation; - return Self; - } - - public DateRangeQueryDescriptor TimeZone(string? timeZone) - { - TimeZoneValue = timeZone; - return Self; - } - - public DateRangeQueryDescriptor To(Elastic.Clients.Elasticsearch.DateMath? to) - { - ToValue = to; - return Self; - } - - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (FieldValue is null) - throw new JsonException("Unable to serialize field name query descriptor with a null field. Ensure you use a suitable descriptor constructor or call the Field method, passing a non-null value for the field argument."); - writer.WriteStartObject(); - writer.WritePropertyName(settings.Inferrer.Field(FieldValue)); - writer.WriteStartObject(); - if (!string.IsNullOrEmpty(QueryNameValue)) - { - writer.WritePropertyName("_name"); - writer.WriteStringValue(QueryNameValue); - } - - if (BoostValue.HasValue) - { - writer.WritePropertyName("boost"); - writer.WriteNumberValue(BoostValue.Value); - } - - if (FormatValue is not null) - { - writer.WritePropertyName("format"); - JsonSerializer.Serialize(writer, FormatValue, options); - } - - if (FromValue is not null) - { - writer.WritePropertyName("from"); - JsonSerializer.Serialize(writer, FromValue, options); - } - - if (GtValue is not null) - { - writer.WritePropertyName("gt"); - JsonSerializer.Serialize(writer, GtValue, options); - } - - if (GteValue is not null) - { - writer.WritePropertyName("gte"); - JsonSerializer.Serialize(writer, GteValue, options); - } - - if (LtValue is not null) - { - writer.WritePropertyName("lt"); - JsonSerializer.Serialize(writer, LtValue, options); - } - - if (LteValue is not null) - { - writer.WritePropertyName("lte"); - JsonSerializer.Serialize(writer, LteValue, options); - } - - if (RelationValue is not null) - { - writer.WritePropertyName("relation"); - JsonSerializer.Serialize(writer, RelationValue, options); - } - - if (TimeZoneValue is not null) - { - writer.WritePropertyName("time_zone"); - JsonSerializer.Serialize(writer, TimeZoneValue, options); - } - - if (ToValue is not null) - { - writer.WritePropertyName("to"); - JsonSerializer.Serialize(writer, ToValue, options); - } - - writer.WriteEndObject(); - writer.WriteEndObject(); - } -} - -public sealed partial class DateRangeQueryDescriptor : SerializableDescriptor -{ - internal DateRangeQueryDescriptor(Action configure) => configure.Invoke(this); - internal DateRangeQueryDescriptor() : base() - { - } - - public DateRangeQueryDescriptor(Field field) - { - if (field is null) - throw new ArgumentNullException(nameof(field)); - FieldValue = field; - } - - private string? QueryNameValue { get; set; } - - private float? BoostValue { get; set; } - - private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; } - - private string? FormatValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? FromValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? GtValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? GteValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? LtValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? LteValue { get; set; } - - private Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? RelationValue { get; set; } - - private string? TimeZoneValue { get; set; } - - private Elastic.Clients.Elasticsearch.DateMath? ToValue { get; set; } - - public DateRangeQueryDescriptor QueryName(string? queryName) - { - QueryNameValue = queryName; - return Self; - } - - public DateRangeQueryDescriptor Boost(float? boost) - { - BoostValue = boost; - return Self; - } - - public DateRangeQueryDescriptor Field(Elastic.Clients.Elasticsearch.Field field) - { - FieldValue = field; - return Self; - } - - public DateRangeQueryDescriptor Field(Expression> field) - { - FieldValue = field; - return Self; - } - - public DateRangeQueryDescriptor Field(Expression> field) - { - FieldValue = field; - return Self; - } - - public DateRangeQueryDescriptor Format(string? format) - { - FormatValue = format; - return Self; - } - - public DateRangeQueryDescriptor From(Elastic.Clients.Elasticsearch.DateMath? from) - { - FromValue = from; - return Self; - } - - public DateRangeQueryDescriptor Gt(Elastic.Clients.Elasticsearch.DateMath? gt) - { - GtValue = gt; - return Self; - } - - public DateRangeQueryDescriptor Gte(Elastic.Clients.Elasticsearch.DateMath? gte) - { - GteValue = gte; - return Self; - } - - public DateRangeQueryDescriptor Lt(Elastic.Clients.Elasticsearch.DateMath? lt) - { - LtValue = lt; - return Self; - } - - public DateRangeQueryDescriptor Lte(Elastic.Clients.Elasticsearch.DateMath? lte) - { - LteValue = lte; - return Self; - } - - public DateRangeQueryDescriptor Relation(Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? relation) - { - RelationValue = relation; - return Self; - } - - public DateRangeQueryDescriptor TimeZone(string? timeZone) - { - TimeZoneValue = timeZone; - return Self; - } - - public DateRangeQueryDescriptor To(Elastic.Clients.Elasticsearch.DateMath? to) - { - ToValue = to; - return Self; - } - - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (FieldValue is null) - throw new JsonException("Unable to serialize field name query descriptor with a null field. Ensure you use a suitable descriptor constructor or call the Field method, passing a non-null value for the field argument."); - writer.WriteStartObject(); - writer.WritePropertyName(settings.Inferrer.Field(FieldValue)); - writer.WriteStartObject(); - if (!string.IsNullOrEmpty(QueryNameValue)) - { - writer.WritePropertyName("_name"); - writer.WriteStringValue(QueryNameValue); - } - - if (BoostValue.HasValue) - { - writer.WritePropertyName("boost"); - writer.WriteNumberValue(BoostValue.Value); - } - - if (FormatValue is not null) - { - writer.WritePropertyName("format"); - JsonSerializer.Serialize(writer, FormatValue, options); - } - - if (FromValue is not null) - { - writer.WritePropertyName("from"); - JsonSerializer.Serialize(writer, FromValue, options); - } - - if (GtValue is not null) - { - writer.WritePropertyName("gt"); - JsonSerializer.Serialize(writer, GtValue, options); - } - - if (GteValue is not null) - { - writer.WritePropertyName("gte"); - JsonSerializer.Serialize(writer, GteValue, options); - } - - if (LtValue is not null) - { - writer.WritePropertyName("lt"); - JsonSerializer.Serialize(writer, LtValue, options); - } - - if (LteValue is not null) - { - writer.WritePropertyName("lte"); - JsonSerializer.Serialize(writer, LteValue, options); - } - - if (RelationValue is not null) - { - writer.WritePropertyName("relation"); - JsonSerializer.Serialize(writer, RelationValue, options); - } - - if (TimeZoneValue is not null) - { - writer.WritePropertyName("time_zone"); - JsonSerializer.Serialize(writer, TimeZoneValue, options); - } - - if (ToValue is not null) - { - writer.WritePropertyName("to"); - JsonSerializer.Serialize(writer, ToValue, options); - } - - writer.WriteEndObject(); - writer.WriteEndObject(); - } -} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DisMaxQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DisMaxQuery.g.cs index 32465646cf0..750203a7c8e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DisMaxQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DisMaxQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class DisMaxQuery : Query +public sealed partial class DisMaxQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -37,13 +37,13 @@ public sealed partial class DisMaxQuery : Query [JsonInclude] [JsonPropertyName("queries")] - public ICollection Queries { get; set; } + public ICollection Queries { get; set; } [JsonInclude] [JsonPropertyName("tie_breaker")] public double? TieBreaker { get; set; } - public static implicit operator QueryContainer(DisMaxQuery disMaxQuery) => QueryContainer.DisMax(disMaxQuery); + public static implicit operator Query(DisMaxQuery disMaxQuery) => QueryDsl.Query.DisMax(disMaxQuery); } public sealed partial class DisMaxQueryDescriptor : SerializableDescriptor> @@ -53,13 +53,13 @@ public DisMaxQueryDescriptor() : base() { } - private ICollection QueriesValue { get; set; } + private ICollection QueriesValue { get; set; } - private QueryContainerDescriptor QueriesDescriptor { get; set; } + private QueryDescriptor QueriesDescriptor { get; set; } - private Action> QueriesDescriptorAction { get; set; } + private Action> QueriesDescriptorAction { get; set; } - private Action>[] QueriesDescriptorActions { get; set; } + private Action>[] QueriesDescriptorActions { get; set; } private string? QueryNameValue { get; set; } @@ -67,7 +67,7 @@ public DisMaxQueryDescriptor() : base() private double? TieBreakerValue { get; set; } - public DisMaxQueryDescriptor Queries(ICollection queries) + public DisMaxQueryDescriptor Queries(ICollection queries) { QueriesDescriptor = null; QueriesDescriptorAction = null; @@ -76,7 +76,7 @@ public DisMaxQueryDescriptor Queries(ICollection Queries(QueryContainerDescriptor descriptor) + public DisMaxQueryDescriptor Queries(QueryDescriptor descriptor) { QueriesValue = null; QueriesDescriptorAction = null; @@ -85,7 +85,7 @@ public DisMaxQueryDescriptor Queries(QueryContainerDescriptor Queries(Action> configure) + public DisMaxQueryDescriptor Queries(Action> configure) { QueriesValue = null; QueriesDescriptor = null; @@ -94,7 +94,7 @@ public DisMaxQueryDescriptor Queries(Action Queries(params Action>[] configure) + public DisMaxQueryDescriptor Queries(params Action>[] configure) { QueriesValue = null; QueriesDescriptor = null; @@ -135,7 +135,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("queries"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueriesDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueriesDescriptorAction), options); writer.WriteEndArray(); } else if (QueriesDescriptorActions is not null) @@ -144,7 +144,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in QueriesDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); @@ -184,13 +184,13 @@ public DisMaxQueryDescriptor() : base() { } - private ICollection QueriesValue { get; set; } + private ICollection QueriesValue { get; set; } - private QueryContainerDescriptor QueriesDescriptor { get; set; } + private QueryDescriptor QueriesDescriptor { get; set; } - private Action QueriesDescriptorAction { get; set; } + private Action QueriesDescriptorAction { get; set; } - private Action[] QueriesDescriptorActions { get; set; } + private Action[] QueriesDescriptorActions { get; set; } private string? QueryNameValue { get; set; } @@ -198,7 +198,7 @@ public DisMaxQueryDescriptor() : base() private double? TieBreakerValue { get; set; } - public DisMaxQueryDescriptor Queries(ICollection queries) + public DisMaxQueryDescriptor Queries(ICollection queries) { QueriesDescriptor = null; QueriesDescriptorAction = null; @@ -207,7 +207,7 @@ public DisMaxQueryDescriptor Queries(ICollection configure) + public DisMaxQueryDescriptor Queries(Action configure) { QueriesValue = null; QueriesDescriptor = null; @@ -225,7 +225,7 @@ public DisMaxQueryDescriptor Queries(Action configure) return Self; } - public DisMaxQueryDescriptor Queries(params Action[] configure) + public DisMaxQueryDescriptor Queries(params Action[] configure) { QueriesValue = null; QueriesDescriptor = null; @@ -266,7 +266,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("queries"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueriesDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueriesDescriptorAction), options); writer.WriteEndArray(); } else if (QueriesDescriptorActions is not null) @@ -275,7 +275,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in QueriesDescriptorActions) { - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(action), options); } writer.WriteEndArray(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ExistsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ExistsQuery.g.cs index 21705173135..1e07fcb184a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ExistsQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ExistsQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class ExistsQuery : Query +public sealed partial class ExistsQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -39,7 +39,7 @@ public sealed partial class ExistsQuery : Query [JsonPropertyName("field")] public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(ExistsQuery existsQuery) => QueryContainer.Exists(existsQuery); + public static implicit operator Query(ExistsQuery existsQuery) => QueryDsl.Query.Exists(existsQuery); } public sealed partial class ExistsQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldValueFactorScoreFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldValueFactorScoreFunction.g.cs index e6f027d6227..4050d49d6c4 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldValueFactorScoreFunction.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldValueFactorScoreFunction.g.cs @@ -43,7 +43,7 @@ public sealed partial class FieldValueFactorScoreFunction [JsonPropertyName("modifier")] public Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorModifier? Modifier { get; set; } - public static implicit operator FunctionScoreContainer(FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => FunctionScoreContainer.FieldValueFactor(fieldValueFactorScoreFunction); + public static implicit operator FunctionScore(FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => QueryDsl.FunctionScore.FieldValueFactor(fieldValueFactorScoreFunction); } public sealed partial class FieldValueFactorScoreFunctionDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs similarity index 59% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs index ba311d2746c..6d9a4e3e8ca 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs @@ -25,10 +25,10 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -[JsonConverter(typeof(FunctionScoreContainerConverter))] -public sealed partial class FunctionScoreContainer +[JsonConverter(typeof(FunctionScoreConverter))] +public sealed partial class FunctionScore { - internal FunctionScoreContainer(string variantName, object variant) + internal FunctionScore(string variantName, object variant) { if (variantName is null) throw new ArgumentNullException(nameof(variantName)); @@ -44,21 +44,21 @@ internal FunctionScoreContainer(string variantName, object variant) internal string VariantName { get; } - public static FunctionScoreContainer FieldValueFactor(Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => new FunctionScoreContainer("field_value_factor", fieldValueFactorScoreFunction); - public static FunctionScoreContainer RandomScore(Elastic.Clients.Elasticsearch.QueryDsl.RandomScoreFunction randomScoreFunction) => new FunctionScoreContainer("random_score", randomScoreFunction); - public static FunctionScoreContainer ScriptScore(Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreFunction scriptScoreFunction) => new FunctionScoreContainer("script_score", scriptScoreFunction); + public static FunctionScore FieldValueFactor(Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => new FunctionScore("field_value_factor", fieldValueFactorScoreFunction); + public static FunctionScore RandomScore(Elastic.Clients.Elasticsearch.QueryDsl.RandomScoreFunction randomScoreFunction) => new FunctionScore("random_score", randomScoreFunction); + public static FunctionScore ScriptScore(Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreFunction scriptScoreFunction) => new FunctionScore("script_score", scriptScoreFunction); [JsonInclude] [JsonPropertyName("filter")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Filter { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; } [JsonInclude] [JsonPropertyName("weight")] public double? Weight { get; set; } } -internal sealed class FunctionScoreContainerConverter : JsonConverter +internal sealed class FunctionScoreConverter : JsonConverter { - public override FunctionScoreContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override FunctionScore Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType != JsonTokenType.StartObject) { @@ -67,7 +67,7 @@ public override FunctionScoreContainer Read(ref Utf8JsonReader reader, Type type object? variantValue = default; string? variantNameValue = default; - Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filterValue = default; + Elastic.Clients.Elasticsearch.QueryDsl.Query? filterValue = default; double? weightValue = default; while (reader.Read() && reader.TokenType != JsonTokenType.EndObject) { @@ -85,7 +85,7 @@ public override FunctionScoreContainer Read(ref Utf8JsonReader reader, Type type reader.Read(); if (propertyName == "filter") { - filterValue = JsonSerializer.Deserialize(ref reader, options); + filterValue = JsonSerializer.Deserialize(ref reader, options); continue; } @@ -116,17 +116,17 @@ public override FunctionScoreContainer Read(ref Utf8JsonReader reader, Type type continue; } - throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'FunctionScoreContainer' from the response."); + throw new JsonException($"Unknown property name '{propertyName}' received while deserializing the 'FunctionScore' from the response."); } reader.Read(); - var result = new FunctionScoreContainer(variantNameValue, variantValue); + var result = new FunctionScore(variantNameValue, variantValue); result.Filter = filterValue; result.Weight = weightValue; return result; } - public override void Write(Utf8JsonWriter writer, FunctionScoreContainer value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, FunctionScore value, JsonSerializerOptions options) { writer.WriteStartObject(); if (value.Filter is not null) @@ -159,10 +159,10 @@ public override void Write(Utf8JsonWriter writer, FunctionScoreContainer value, } } -public sealed partial class FunctionScoreContainerDescriptor : SerializableDescriptor> +public sealed partial class FunctionScoreDescriptor : SerializableDescriptor> { - internal FunctionScoreContainerDescriptor(Action> configure) => configure.Invoke(this); - public FunctionScoreContainerDescriptor() : base() + internal FunctionScoreDescriptor(Action> configure) => configure.Invoke(this); + public FunctionScoreDescriptor() : base() { } @@ -174,7 +174,7 @@ public FunctionScoreContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private FunctionScoreContainerDescriptor Set(Action descriptorAction, string variantName) + private FunctionScoreDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -185,7 +185,7 @@ private FunctionScoreContainerDescriptor Set(Action descriptorA return Self; } - private FunctionScoreContainerDescriptor Set(object variant, string variantName) + private FunctionScoreDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -193,15 +193,15 @@ private FunctionScoreContainerDescriptor Set(object variant, string v return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDescriptor FilterDescriptor { get; set; } - private Action> FilterDescriptorAction { get; set; } + private Action> FilterDescriptorAction { get; set; } private double? WeightValue { get; set; } - public FunctionScoreContainerDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public FunctionScoreDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -209,7 +209,7 @@ public FunctionScoreContainerDescriptor Filter(Elastic.Clients.Elasti return Self; } - public FunctionScoreContainerDescriptor Filter(QueryContainerDescriptor descriptor) + public FunctionScoreDescriptor Filter(QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -217,7 +217,7 @@ public FunctionScoreContainerDescriptor Filter(QueryContainerDescript return Self; } - public FunctionScoreContainerDescriptor Filter(Action> configure) + public FunctionScoreDescriptor Filter(Action> configure) { FilterValue = null; FilterDescriptor = null; @@ -225,18 +225,18 @@ public FunctionScoreContainerDescriptor Filter(Action Weight(double? weight) + public FunctionScoreDescriptor Weight(double? weight) { WeightValue = weight; return Self; } - public FunctionScoreContainerDescriptor FieldValueFactor(FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor"); - public FunctionScoreContainerDescriptor FieldValueFactor(Action> configure) => Set(configure, "field_value_factor"); - public FunctionScoreContainerDescriptor RandomScore(RandomScoreFunction randomScoreFunction) => Set(randomScoreFunction, "random_score"); - public FunctionScoreContainerDescriptor RandomScore(Action> configure) => Set(configure, "random_score"); - public FunctionScoreContainerDescriptor ScriptScore(ScriptScoreFunction scriptScoreFunction) => Set(scriptScoreFunction, "script_score"); - public FunctionScoreContainerDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); + public FunctionScoreDescriptor FieldValueFactor(FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor"); + public FunctionScoreDescriptor FieldValueFactor(Action> configure) => Set(configure, "field_value_factor"); + public FunctionScoreDescriptor RandomScore(RandomScoreFunction randomScoreFunction) => Set(randomScoreFunction, "random_score"); + public FunctionScoreDescriptor RandomScore(Action> configure) => Set(configure, "random_score"); + public FunctionScoreDescriptor ScriptScore(ScriptScoreFunction scriptScoreFunction) => Set(scriptScoreFunction, "script_score"); + public FunctionScoreDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -254,7 +254,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { @@ -281,10 +281,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class FunctionScoreContainerDescriptor : SerializableDescriptor +public sealed partial class FunctionScoreDescriptor : SerializableDescriptor { - internal FunctionScoreContainerDescriptor(Action configure) => configure.Invoke(this); - public FunctionScoreContainerDescriptor() : base() + internal FunctionScoreDescriptor(Action configure) => configure.Invoke(this); + public FunctionScoreDescriptor() : base() { } @@ -296,7 +296,7 @@ public FunctionScoreContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private FunctionScoreContainerDescriptor Set(Action descriptorAction, string variantName) + private FunctionScoreDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -307,7 +307,7 @@ private FunctionScoreContainerDescriptor Set(Action descriptorAction, stri return Self; } - private FunctionScoreContainerDescriptor Set(object variant, string variantName) + private FunctionScoreDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -315,15 +315,15 @@ private FunctionScoreContainerDescriptor Set(object variant, string variantName) return Self; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? FilterValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; } - private QueryContainerDescriptor FilterDescriptor { get; set; } + private QueryDescriptor FilterDescriptor { get; set; } - private Action FilterDescriptorAction { get; set; } + private Action FilterDescriptorAction { get; set; } private double? WeightValue { get; set; } - public FunctionScoreContainerDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter) + public FunctionScoreDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter) { FilterDescriptor = null; FilterDescriptorAction = null; @@ -331,7 +331,7 @@ public FunctionScoreContainerDescriptor Filter(Elastic.Clients.Elasticsearch.Que return Self; } - public FunctionScoreContainerDescriptor Filter(QueryContainerDescriptor descriptor) + public FunctionScoreDescriptor Filter(QueryDescriptor descriptor) { FilterValue = null; FilterDescriptorAction = null; @@ -339,7 +339,7 @@ public FunctionScoreContainerDescriptor Filter(QueryContainerDescriptor descript return Self; } - public FunctionScoreContainerDescriptor Filter(Action configure) + public FunctionScoreDescriptor Filter(Action configure) { FilterValue = null; FilterDescriptor = null; @@ -347,20 +347,20 @@ public FunctionScoreContainerDescriptor Filter(Action return Self; } - public FunctionScoreContainerDescriptor Weight(double? weight) + public FunctionScoreDescriptor Weight(double? weight) { WeightValue = weight; return Self; } - public FunctionScoreContainerDescriptor FieldValueFactor(FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor"); - public FunctionScoreContainerDescriptor FieldValueFactor(Action configure) => Set(configure, "field_value_factor"); - public FunctionScoreContainerDescriptor FieldValueFactor(Action> configure) => Set(configure, "field_value_factor"); - public FunctionScoreContainerDescriptor RandomScore(RandomScoreFunction randomScoreFunction) => Set(randomScoreFunction, "random_score"); - public FunctionScoreContainerDescriptor RandomScore(Action configure) => Set(configure, "random_score"); - public FunctionScoreContainerDescriptor RandomScore(Action> configure) => Set(configure, "random_score"); - public FunctionScoreContainerDescriptor ScriptScore(ScriptScoreFunction scriptScoreFunction) => Set(scriptScoreFunction, "script_score"); - public FunctionScoreContainerDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); + public FunctionScoreDescriptor FieldValueFactor(FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor"); + public FunctionScoreDescriptor FieldValueFactor(Action configure) => Set(configure, "field_value_factor"); + public FunctionScoreDescriptor FieldValueFactor(Action> configure) => Set(configure, "field_value_factor"); + public FunctionScoreDescriptor RandomScore(RandomScoreFunction randomScoreFunction) => Set(randomScoreFunction, "random_score"); + public FunctionScoreDescriptor RandomScore(Action configure) => Set(configure, "random_score"); + public FunctionScoreDescriptor RandomScore(Action> configure) => Set(configure, "random_score"); + public FunctionScoreDescriptor ScriptScore(ScriptScoreFunction scriptScoreFunction) => Set(scriptScoreFunction, "script_score"); + public FunctionScoreDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -378,7 +378,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (FilterDescriptorAction is not null) { writer.WritePropertyName("filter"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(FilterDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(FilterDescriptorAction), options); } else if (FilterValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs index 6ee34cf0fa8..36abac17ad0 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class FunctionScoreQuery : Query +public sealed partial class FunctionScoreQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -41,7 +41,7 @@ public sealed partial class FunctionScoreQuery : Query [JsonInclude] [JsonPropertyName("functions")] - public ICollection? Functions { get; set; } + public ICollection? Functions { get; set; } [JsonInclude] [JsonPropertyName("max_boost")] @@ -53,13 +53,13 @@ public sealed partial class FunctionScoreQuery : Query [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; } [JsonInclude] [JsonPropertyName("score_mode")] public Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreMode? ScoreMode { get; set; } - public static implicit operator QueryContainer(FunctionScoreQuery functionScoreQuery) => QueryContainer.FunctionScore(functionScoreQuery); + public static implicit operator Query(FunctionScoreQuery functionScoreQuery) => QueryDsl.Query.FunctionScore(functionScoreQuery); } public sealed partial class FunctionScoreQueryDescriptor : SerializableDescriptor> @@ -69,19 +69,19 @@ public FunctionScoreQueryDescriptor() : base() { } - private ICollection? FunctionsValue { get; set; } + private ICollection? FunctionsValue { get; set; } - private FunctionScoreContainerDescriptor FunctionsDescriptor { get; set; } + private FunctionScoreDescriptor FunctionsDescriptor { get; set; } - private Action> FunctionsDescriptorAction { get; set; } + private Action> FunctionsDescriptorAction { get; set; } - private Action>[] FunctionsDescriptorActions { get; set; } + private Action>[] FunctionsDescriptorActions { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -95,7 +95,7 @@ public FunctionScoreQueryDescriptor() : base() private Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreMode? ScoreModeValue { get; set; } - public FunctionScoreQueryDescriptor Functions(ICollection? functions) + public FunctionScoreQueryDescriptor Functions(ICollection? functions) { FunctionsDescriptor = null; FunctionsDescriptorAction = null; @@ -104,7 +104,7 @@ public FunctionScoreQueryDescriptor Functions(ICollection Functions(FunctionScoreContainerDescriptor descriptor) + public FunctionScoreQueryDescriptor Functions(FunctionScoreDescriptor descriptor) { FunctionsValue = null; FunctionsDescriptorAction = null; @@ -113,7 +113,7 @@ public FunctionScoreQueryDescriptor Functions(FunctionScoreContainerD return Self; } - public FunctionScoreQueryDescriptor Functions(Action> configure) + public FunctionScoreQueryDescriptor Functions(Action> configure) { FunctionsValue = null; FunctionsDescriptor = null; @@ -122,7 +122,7 @@ public FunctionScoreQueryDescriptor Functions(Action Functions(params Action>[] configure) + public FunctionScoreQueryDescriptor Functions(params Action>[] configure) { FunctionsValue = null; FunctionsDescriptor = null; @@ -131,7 +131,7 @@ public FunctionScoreQueryDescriptor Functions(params Action Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) + public FunctionScoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -139,7 +139,7 @@ public FunctionScoreQueryDescriptor Query(Elastic.Clients.Elasticsear return Self; } - public FunctionScoreQueryDescriptor Query(QueryContainerDescriptor descriptor) + public FunctionScoreQueryDescriptor Query(QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -147,7 +147,7 @@ public FunctionScoreQueryDescriptor Query(QueryContainerDescriptor Query(Action> configure) + public FunctionScoreQueryDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -205,7 +205,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("functions"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new FunctionScoreContainerDescriptor(FunctionsDescriptorAction), options); + JsonSerializer.Serialize(writer, new FunctionScoreDescriptor(FunctionsDescriptorAction), options); writer.WriteEndArray(); } else if (FunctionsDescriptorActions is not null) @@ -214,7 +214,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in FunctionsDescriptorActions) { - JsonSerializer.Serialize(writer, new FunctionScoreContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new FunctionScoreDescriptor(action), options); } writer.WriteEndArray(); @@ -233,7 +233,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { @@ -288,19 +288,19 @@ public FunctionScoreQueryDescriptor() : base() { } - private ICollection? FunctionsValue { get; set; } + private ICollection? FunctionsValue { get; set; } - private FunctionScoreContainerDescriptor FunctionsDescriptor { get; set; } + private FunctionScoreDescriptor FunctionsDescriptor { get; set; } - private Action FunctionsDescriptorAction { get; set; } + private Action FunctionsDescriptorAction { get; set; } - private Action[] FunctionsDescriptorActions { get; set; } + private Action[] FunctionsDescriptorActions { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -314,7 +314,7 @@ public FunctionScoreQueryDescriptor() : base() private Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreMode? ScoreModeValue { get; set; } - public FunctionScoreQueryDescriptor Functions(ICollection? functions) + public FunctionScoreQueryDescriptor Functions(ICollection? functions) { FunctionsDescriptor = null; FunctionsDescriptorAction = null; @@ -323,7 +323,7 @@ public FunctionScoreQueryDescriptor Functions(ICollection configure) + public FunctionScoreQueryDescriptor Functions(Action configure) { FunctionsValue = null; FunctionsDescriptor = null; @@ -341,7 +341,7 @@ public FunctionScoreQueryDescriptor Functions(Action[] configure) + public FunctionScoreQueryDescriptor Functions(params Action[] configure) { FunctionsValue = null; FunctionsDescriptor = null; @@ -350,7 +350,7 @@ public FunctionScoreQueryDescriptor Functions(params Action configure) + public FunctionScoreQueryDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -424,7 +424,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("functions"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new FunctionScoreContainerDescriptor(FunctionsDescriptorAction), options); + JsonSerializer.Serialize(writer, new FunctionScoreDescriptor(FunctionsDescriptorAction), options); writer.WriteEndArray(); } else if (FunctionsDescriptorActions is not null) @@ -433,7 +433,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in FunctionsDescriptorActions) { - JsonSerializer.Serialize(writer, new FunctionScoreContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new FunctionScoreDescriptor(action), options); } writer.WriteEndArray(); @@ -452,7 +452,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else if (QueryValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs index d555b8a4db4..71bf87e29a3 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs @@ -157,7 +157,7 @@ public override void Write(Utf8JsonWriter writer, FuzzyQuery value, JsonSerializ } [JsonConverter(typeof(FuzzyQueryConverter))] -public sealed partial class FuzzyQuery : Query +public sealed partial class FuzzyQuery : SearchQuery { public FuzzyQuery(Field field) { @@ -184,7 +184,7 @@ public FuzzyQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(FuzzyQuery fuzzyQuery) => QueryContainer.Fuzzy(fuzzyQuery); + public static implicit operator Query(FuzzyQuery fuzzyQuery) => QueryDsl.Query.Fuzzy(fuzzyQuery); } public sealed partial class FuzzyQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasChildQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasChildQuery.g.cs index e8e5444bf39..e54737466d6 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasChildQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasChildQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class HasChildQuery : Query +public sealed partial class HasChildQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -53,7 +53,7 @@ public sealed partial class HasChildQuery : Query [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; } [JsonInclude] [JsonPropertyName("score_mode")] @@ -63,7 +63,7 @@ public sealed partial class HasChildQuery : Query [JsonPropertyName("type")] public string Type { get; set; } - public static implicit operator QueryContainer(HasChildQuery hasChildQuery) => QueryContainer.HasChild(hasChildQuery); + public static implicit operator Query(HasChildQuery hasChildQuery) => QueryDsl.Query.HasChild(hasChildQuery); } public sealed partial class HasChildQueryDescriptor : SerializableDescriptor> @@ -79,11 +79,11 @@ public HasChildQueryDescriptor() : base() private Action> InnerHitsDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -123,7 +123,7 @@ public HasChildQueryDescriptor InnerHits(Action Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public HasChildQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -131,7 +131,7 @@ public HasChildQueryDescriptor Query(Elastic.Clients.Elasticsearch.Qu return Self; } - public HasChildQueryDescriptor Query(QueryContainerDescriptor descriptor) + public HasChildQueryDescriptor Query(QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -139,7 +139,7 @@ public HasChildQueryDescriptor Query(QueryContainerDescriptor Query(Action> configure) + public HasChildQueryDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -216,7 +216,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else { @@ -279,11 +279,11 @@ public HasChildQueryDescriptor() : base() private Action InnerHitsDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -323,7 +323,7 @@ public HasChildQueryDescriptor InnerHits(Action return Self; } - public HasChildQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public HasChildQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -331,7 +331,7 @@ public HasChildQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Quer return Self; } - public HasChildQueryDescriptor Query(QueryContainerDescriptor descriptor) + public HasChildQueryDescriptor Query(QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -339,7 +339,7 @@ public HasChildQueryDescriptor Query(QueryContainerDescriptor descriptor) return Self; } - public HasChildQueryDescriptor Query(Action configure) + public HasChildQueryDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -416,7 +416,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasParentQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasParentQuery.g.cs index c041ecb6752..56b896f6758 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasParentQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasParentQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class HasParentQuery : Query +public sealed partial class HasParentQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -49,13 +49,13 @@ public sealed partial class HasParentQuery : Query [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; } [JsonInclude] [JsonPropertyName("score")] public bool? Score { get; set; } - public static implicit operator QueryContainer(HasParentQuery hasParentQuery) => QueryContainer.HasParent(hasParentQuery); + public static implicit operator Query(HasParentQuery hasParentQuery) => QueryDsl.Query.HasParent(hasParentQuery); } public sealed partial class HasParentQueryDescriptor : SerializableDescriptor> @@ -71,11 +71,11 @@ public HasParentQueryDescriptor() : base() private Action> InnerHitsDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -111,7 +111,7 @@ public HasParentQueryDescriptor InnerHits(Action Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public HasParentQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -119,7 +119,7 @@ public HasParentQueryDescriptor Query(Elastic.Clients.Elasticsearch.Q return Self; } - public HasParentQueryDescriptor Query(QueryContainerDescriptor descriptor) + public HasParentQueryDescriptor Query(QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -127,7 +127,7 @@ public HasParentQueryDescriptor Query(QueryContainerDescriptor Query(Action> configure) + public HasParentQueryDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -192,7 +192,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else { @@ -243,11 +243,11 @@ public HasParentQueryDescriptor() : base() private Action InnerHitsDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -283,7 +283,7 @@ public HasParentQueryDescriptor InnerHits(Action configure) + public HasParentQueryDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -364,7 +364,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IdsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IdsQuery.g.cs index daf49a05cbd..aede0e46f55 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IdsQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IdsQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class IdsQuery : Query +public sealed partial class IdsQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -39,7 +39,7 @@ public sealed partial class IdsQuery : Query [JsonPropertyName("values")] public Elastic.Clients.Elasticsearch.Ids? Values { get; set; } - public static implicit operator QueryContainer(IdsQuery idsQuery) => QueryContainer.Ids(idsQuery); + public static implicit operator Query(IdsQuery idsQuery) => QueryDsl.Query.Ids(idsQuery); } public sealed partial class IdsQueryDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs similarity index 51% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs index a189af2dcb3..290af59dca3 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs @@ -25,10 +25,10 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -[JsonConverter(typeof(IntervalsContainerConverter))] -public sealed partial class IntervalsContainer +[JsonConverter(typeof(IntervalsConverter))] +public sealed partial class Intervals { - internal IntervalsContainer(string variantName, object variant) + internal Intervals(string variantName, object variant) { if (variantName is null) throw new ArgumentNullException(nameof(variantName)); @@ -44,17 +44,17 @@ internal IntervalsContainer(string variantName, object variant) internal string VariantName { get; } - public static IntervalsContainer AllOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf intervalsAllOf) => new IntervalsContainer("all_of", intervalsAllOf); - public static IntervalsContainer AnyOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf intervalsAnyOf) => new IntervalsContainer("any_of", intervalsAnyOf); - public static IntervalsContainer Fuzzy(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy intervalsFuzzy) => new IntervalsContainer("fuzzy", intervalsFuzzy); - public static IntervalsContainer Match(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch intervalsMatch) => new IntervalsContainer("match", intervalsMatch); - public static IntervalsContainer Prefix(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix intervalsPrefix) => new IntervalsContainer("prefix", intervalsPrefix); - public static IntervalsContainer Wildcard(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard intervalsWildcard) => new IntervalsContainer("wildcard", intervalsWildcard); + public static Intervals AllOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf intervalsAllOf) => new Intervals("all_of", intervalsAllOf); + public static Intervals AnyOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAnyOf intervalsAnyOf) => new Intervals("any_of", intervalsAnyOf); + public static Intervals Fuzzy(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFuzzy intervalsFuzzy) => new Intervals("fuzzy", intervalsFuzzy); + public static Intervals Match(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch intervalsMatch) => new Intervals("match", intervalsMatch); + public static Intervals Prefix(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix intervalsPrefix) => new Intervals("prefix", intervalsPrefix); + public static Intervals Wildcard(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard intervalsWildcard) => new Intervals("wildcard", intervalsWildcard); } -internal sealed class IntervalsContainerConverter : JsonConverter +internal sealed class IntervalsConverter : JsonConverter { - public override IntervalsContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override Intervals Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType != JsonTokenType.StartObject) { @@ -73,48 +73,48 @@ public override IntervalsContainer Read(ref Utf8JsonReader reader, Type typeToCo { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new IntervalsContainer(propertyName, variant); + return new Intervals(propertyName, variant); } if (propertyName == "any_of") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new IntervalsContainer(propertyName, variant); + return new Intervals(propertyName, variant); } if (propertyName == "fuzzy") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new IntervalsContainer(propertyName, variant); + return new Intervals(propertyName, variant); } if (propertyName == "match") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new IntervalsContainer(propertyName, variant); + return new Intervals(propertyName, variant); } if (propertyName == "prefix") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new IntervalsContainer(propertyName, variant); + return new Intervals(propertyName, variant); } if (propertyName == "wildcard") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new IntervalsContainer(propertyName, variant); + return new Intervals(propertyName, variant); } throw new JsonException(); } - public override void Write(Utf8JsonWriter writer, IntervalsContainer value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, Intervals value, JsonSerializerOptions options) { writer.WriteStartObject(); writer.WritePropertyName(value.VariantName); @@ -144,10 +144,10 @@ public override void Write(Utf8JsonWriter writer, IntervalsContainer value, Json } } -public sealed partial class IntervalsContainerDescriptor : SerializableDescriptor> +public sealed partial class IntervalsDescriptor : SerializableDescriptor> { - internal IntervalsContainerDescriptor(Action> configure) => configure.Invoke(this); - public IntervalsContainerDescriptor() : base() + internal IntervalsDescriptor(Action> configure) => configure.Invoke(this); + public IntervalsDescriptor() : base() { } @@ -159,7 +159,7 @@ public IntervalsContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private IntervalsContainerDescriptor Set(Action descriptorAction, string variantName) + private IntervalsDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -170,7 +170,7 @@ private IntervalsContainerDescriptor Set(Action descriptorActio return Self; } - private IntervalsContainerDescriptor Set(object variant, string variantName) + private IntervalsDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -178,18 +178,18 @@ private IntervalsContainerDescriptor Set(object variant, string varia return Self; } - public IntervalsContainerDescriptor AllOf(IntervalsAllOf intervalsAllOf) => Set(intervalsAllOf, "all_of"); - public IntervalsContainerDescriptor AllOf(Action> configure) => Set(configure, "all_of"); - public IntervalsContainerDescriptor AnyOf(IntervalsAnyOf intervalsAnyOf) => Set(intervalsAnyOf, "any_of"); - public IntervalsContainerDescriptor AnyOf(Action> configure) => Set(configure, "any_of"); - public IntervalsContainerDescriptor Fuzzy(IntervalsFuzzy intervalsFuzzy) => Set(intervalsFuzzy, "fuzzy"); - public IntervalsContainerDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public IntervalsContainerDescriptor Match(IntervalsMatch intervalsMatch) => Set(intervalsMatch, "match"); - public IntervalsContainerDescriptor Match(Action> configure) => Set(configure, "match"); - public IntervalsContainerDescriptor Prefix(IntervalsPrefix intervalsPrefix) => Set(intervalsPrefix, "prefix"); - public IntervalsContainerDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public IntervalsContainerDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard"); - public IntervalsContainerDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); + public IntervalsDescriptor AllOf(IntervalsAllOf intervalsAllOf) => Set(intervalsAllOf, "all_of"); + public IntervalsDescriptor AllOf(Action> configure) => Set(configure, "all_of"); + public IntervalsDescriptor AnyOf(IntervalsAnyOf intervalsAnyOf) => Set(intervalsAnyOf, "any_of"); + public IntervalsDescriptor AnyOf(Action> configure) => Set(configure, "any_of"); + public IntervalsDescriptor Fuzzy(IntervalsFuzzy intervalsFuzzy) => Set(intervalsFuzzy, "fuzzy"); + public IntervalsDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); + public IntervalsDescriptor Match(IntervalsMatch intervalsMatch) => Set(intervalsMatch, "match"); + public IntervalsDescriptor Match(Action> configure) => Set(configure, "match"); + public IntervalsDescriptor Prefix(IntervalsPrefix intervalsPrefix) => Set(intervalsPrefix, "prefix"); + public IntervalsDescriptor Prefix(Action> configure) => Set(configure, "prefix"); + public IntervalsDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard"); + public IntervalsDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -212,10 +212,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class IntervalsContainerDescriptor : SerializableDescriptor +public sealed partial class IntervalsDescriptor : SerializableDescriptor { - internal IntervalsContainerDescriptor(Action configure) => configure.Invoke(this); - public IntervalsContainerDescriptor() : base() + internal IntervalsDescriptor(Action configure) => configure.Invoke(this); + public IntervalsDescriptor() : base() { } @@ -227,7 +227,7 @@ public IntervalsContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private IntervalsContainerDescriptor Set(Action descriptorAction, string variantName) + private IntervalsDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -238,7 +238,7 @@ private IntervalsContainerDescriptor Set(Action descriptorAction, string v return Self; } - private IntervalsContainerDescriptor Set(object variant, string variantName) + private IntervalsDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -246,24 +246,24 @@ private IntervalsContainerDescriptor Set(object variant, string variantName) return Self; } - public IntervalsContainerDescriptor AllOf(IntervalsAllOf intervalsAllOf) => Set(intervalsAllOf, "all_of"); - public IntervalsContainerDescriptor AllOf(Action configure) => Set(configure, "all_of"); - public IntervalsContainerDescriptor AllOf(Action> configure) => Set(configure, "all_of"); - public IntervalsContainerDescriptor AnyOf(IntervalsAnyOf intervalsAnyOf) => Set(intervalsAnyOf, "any_of"); - public IntervalsContainerDescriptor AnyOf(Action configure) => Set(configure, "any_of"); - public IntervalsContainerDescriptor AnyOf(Action> configure) => Set(configure, "any_of"); - public IntervalsContainerDescriptor Fuzzy(IntervalsFuzzy intervalsFuzzy) => Set(intervalsFuzzy, "fuzzy"); - public IntervalsContainerDescriptor Fuzzy(Action configure) => Set(configure, "fuzzy"); - public IntervalsContainerDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public IntervalsContainerDescriptor Match(IntervalsMatch intervalsMatch) => Set(intervalsMatch, "match"); - public IntervalsContainerDescriptor Match(Action configure) => Set(configure, "match"); - public IntervalsContainerDescriptor Match(Action> configure) => Set(configure, "match"); - public IntervalsContainerDescriptor Prefix(IntervalsPrefix intervalsPrefix) => Set(intervalsPrefix, "prefix"); - public IntervalsContainerDescriptor Prefix(Action configure) => Set(configure, "prefix"); - public IntervalsContainerDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public IntervalsContainerDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard"); - public IntervalsContainerDescriptor Wildcard(Action configure) => Set(configure, "wildcard"); - public IntervalsContainerDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); + public IntervalsDescriptor AllOf(IntervalsAllOf intervalsAllOf) => Set(intervalsAllOf, "all_of"); + public IntervalsDescriptor AllOf(Action configure) => Set(configure, "all_of"); + public IntervalsDescriptor AllOf(Action> configure) => Set(configure, "all_of"); + public IntervalsDescriptor AnyOf(IntervalsAnyOf intervalsAnyOf) => Set(intervalsAnyOf, "any_of"); + public IntervalsDescriptor AnyOf(Action configure) => Set(configure, "any_of"); + public IntervalsDescriptor AnyOf(Action> configure) => Set(configure, "any_of"); + public IntervalsDescriptor Fuzzy(IntervalsFuzzy intervalsFuzzy) => Set(intervalsFuzzy, "fuzzy"); + public IntervalsDescriptor Fuzzy(Action configure) => Set(configure, "fuzzy"); + public IntervalsDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); + public IntervalsDescriptor Match(IntervalsMatch intervalsMatch) => Set(intervalsMatch, "match"); + public IntervalsDescriptor Match(Action configure) => Set(configure, "match"); + public IntervalsDescriptor Match(Action> configure) => Set(configure, "match"); + public IntervalsDescriptor Prefix(IntervalsPrefix intervalsPrefix) => Set(intervalsPrefix, "prefix"); + public IntervalsDescriptor Prefix(Action configure) => Set(configure, "prefix"); + public IntervalsDescriptor Prefix(Action> configure) => Set(configure, "prefix"); + public IntervalsDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard"); + public IntervalsDescriptor Wildcard(Action configure) => Set(configure, "wildcard"); + public IntervalsDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAllOf.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAllOf.g.cs index 9a7afa1f966..2a00ba20cc0 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAllOf.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAllOf.g.cs @@ -33,7 +33,7 @@ public sealed partial class IntervalsAllOf [JsonInclude] [JsonPropertyName("intervals")] - public ICollection Intervals { get; set; } + public ICollection Intervals { get; set; } [JsonInclude] [JsonPropertyName("max_gaps")] @@ -51,13 +51,13 @@ public IntervalsAllOfDescriptor() : base() { } - private ICollection IntervalsValue { get; set; } + private ICollection IntervalsValue { get; set; } - private IntervalsContainerDescriptor IntervalsDescriptor { get; set; } + private IntervalsDescriptor IntervalsDescriptor { get; set; } - private Action> IntervalsDescriptorAction { get; set; } + private Action> IntervalsDescriptorAction { get; set; } - private Action>[] IntervalsDescriptorActions { get; set; } + private Action>[] IntervalsDescriptorActions { get; set; } private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; } @@ -69,7 +69,7 @@ public IntervalsAllOfDescriptor() : base() private bool? OrderedValue { get; set; } - public IntervalsAllOfDescriptor Intervals(ICollection intervals) + public IntervalsAllOfDescriptor Intervals(ICollection intervals) { IntervalsDescriptor = null; IntervalsDescriptorAction = null; @@ -78,7 +78,7 @@ public IntervalsAllOfDescriptor Intervals(ICollection Intervals(IntervalsContainerDescriptor descriptor) + public IntervalsAllOfDescriptor Intervals(IntervalsDescriptor descriptor) { IntervalsValue = null; IntervalsDescriptorAction = null; @@ -87,7 +87,7 @@ public IntervalsAllOfDescriptor Intervals(IntervalsContainerDescripto return Self; } - public IntervalsAllOfDescriptor Intervals(Action> configure) + public IntervalsAllOfDescriptor Intervals(Action> configure) { IntervalsValue = null; IntervalsDescriptor = null; @@ -96,7 +96,7 @@ public IntervalsAllOfDescriptor Intervals(Action Intervals(params Action>[] configure) + public IntervalsAllOfDescriptor Intervals(params Action>[] configure) { IntervalsValue = null; IntervalsDescriptor = null; @@ -155,7 +155,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("intervals"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new IntervalsContainerDescriptor(IntervalsDescriptorAction), options); + JsonSerializer.Serialize(writer, new IntervalsDescriptor(IntervalsDescriptorAction), options); writer.WriteEndArray(); } else if (IntervalsDescriptorActions is not null) @@ -164,7 +164,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in IntervalsDescriptorActions) { - JsonSerializer.Serialize(writer, new IntervalsContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new IntervalsDescriptor(action), options); } writer.WriteEndArray(); @@ -214,13 +214,13 @@ public IntervalsAllOfDescriptor() : base() { } - private ICollection IntervalsValue { get; set; } + private ICollection IntervalsValue { get; set; } - private IntervalsContainerDescriptor IntervalsDescriptor { get; set; } + private IntervalsDescriptor IntervalsDescriptor { get; set; } - private Action IntervalsDescriptorAction { get; set; } + private Action IntervalsDescriptorAction { get; set; } - private Action[] IntervalsDescriptorActions { get; set; } + private Action[] IntervalsDescriptorActions { get; set; } private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; } @@ -232,7 +232,7 @@ public IntervalsAllOfDescriptor() : base() private bool? OrderedValue { get; set; } - public IntervalsAllOfDescriptor Intervals(ICollection intervals) + public IntervalsAllOfDescriptor Intervals(ICollection intervals) { IntervalsDescriptor = null; IntervalsDescriptorAction = null; @@ -241,7 +241,7 @@ public IntervalsAllOfDescriptor Intervals(ICollection configure) + public IntervalsAllOfDescriptor Intervals(Action configure) { IntervalsValue = null; IntervalsDescriptor = null; @@ -259,7 +259,7 @@ public IntervalsAllOfDescriptor Intervals(Action c return Self; } - public IntervalsAllOfDescriptor Intervals(params Action[] configure) + public IntervalsAllOfDescriptor Intervals(params Action[] configure) { IntervalsValue = null; IntervalsDescriptor = null; @@ -318,7 +318,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("intervals"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new IntervalsContainerDescriptor(IntervalsDescriptorAction), options); + JsonSerializer.Serialize(writer, new IntervalsDescriptor(IntervalsDescriptorAction), options); writer.WriteEndArray(); } else if (IntervalsDescriptorActions is not null) @@ -327,7 +327,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in IntervalsDescriptorActions) { - JsonSerializer.Serialize(writer, new IntervalsContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new IntervalsDescriptor(action), options); } writer.WriteEndArray(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAnyOf.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAnyOf.g.cs index 1642423660b..3bd5925cb8d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAnyOf.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAnyOf.g.cs @@ -33,7 +33,7 @@ public sealed partial class IntervalsAnyOf [JsonInclude] [JsonPropertyName("intervals")] - public ICollection Intervals { get; set; } + public ICollection Intervals { get; set; } } public sealed partial class IntervalsAnyOfDescriptor : SerializableDescriptor> @@ -43,13 +43,13 @@ public IntervalsAnyOfDescriptor() : base() { } - private ICollection IntervalsValue { get; set; } + private ICollection IntervalsValue { get; set; } - private IntervalsContainerDescriptor IntervalsDescriptor { get; set; } + private IntervalsDescriptor IntervalsDescriptor { get; set; } - private Action> IntervalsDescriptorAction { get; set; } + private Action> IntervalsDescriptorAction { get; set; } - private Action>[] IntervalsDescriptorActions { get; set; } + private Action>[] IntervalsDescriptorActions { get; set; } private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; } @@ -57,7 +57,7 @@ public IntervalsAnyOfDescriptor() : base() private Action FilterDescriptorAction { get; set; } - public IntervalsAnyOfDescriptor Intervals(ICollection intervals) + public IntervalsAnyOfDescriptor Intervals(ICollection intervals) { IntervalsDescriptor = null; IntervalsDescriptorAction = null; @@ -66,7 +66,7 @@ public IntervalsAnyOfDescriptor Intervals(ICollection Intervals(IntervalsContainerDescriptor descriptor) + public IntervalsAnyOfDescriptor Intervals(IntervalsDescriptor descriptor) { IntervalsValue = null; IntervalsDescriptorAction = null; @@ -75,7 +75,7 @@ public IntervalsAnyOfDescriptor Intervals(IntervalsContainerDescripto return Self; } - public IntervalsAnyOfDescriptor Intervals(Action> configure) + public IntervalsAnyOfDescriptor Intervals(Action> configure) { IntervalsValue = null; IntervalsDescriptor = null; @@ -84,7 +84,7 @@ public IntervalsAnyOfDescriptor Intervals(Action Intervals(params Action>[] configure) + public IntervalsAnyOfDescriptor Intervals(params Action>[] configure) { IntervalsValue = null; IntervalsDescriptor = null; @@ -131,7 +131,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("intervals"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new IntervalsContainerDescriptor(IntervalsDescriptorAction), options); + JsonSerializer.Serialize(writer, new IntervalsDescriptor(IntervalsDescriptorAction), options); writer.WriteEndArray(); } else if (IntervalsDescriptorActions is not null) @@ -140,7 +140,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in IntervalsDescriptorActions) { - JsonSerializer.Serialize(writer, new IntervalsContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new IntervalsDescriptor(action), options); } writer.WriteEndArray(); @@ -178,13 +178,13 @@ public IntervalsAnyOfDescriptor() : base() { } - private ICollection IntervalsValue { get; set; } + private ICollection IntervalsValue { get; set; } - private IntervalsContainerDescriptor IntervalsDescriptor { get; set; } + private IntervalsDescriptor IntervalsDescriptor { get; set; } - private Action IntervalsDescriptorAction { get; set; } + private Action IntervalsDescriptorAction { get; set; } - private Action[] IntervalsDescriptorActions { get; set; } + private Action[] IntervalsDescriptorActions { get; set; } private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; } @@ -192,7 +192,7 @@ public IntervalsAnyOfDescriptor() : base() private Action FilterDescriptorAction { get; set; } - public IntervalsAnyOfDescriptor Intervals(ICollection intervals) + public IntervalsAnyOfDescriptor Intervals(ICollection intervals) { IntervalsDescriptor = null; IntervalsDescriptorAction = null; @@ -201,7 +201,7 @@ public IntervalsAnyOfDescriptor Intervals(ICollection configure) + public IntervalsAnyOfDescriptor Intervals(Action configure) { IntervalsValue = null; IntervalsDescriptor = null; @@ -219,7 +219,7 @@ public IntervalsAnyOfDescriptor Intervals(Action c return Self; } - public IntervalsAnyOfDescriptor Intervals(params Action[] configure) + public IntervalsAnyOfDescriptor Intervals(params Action[] configure) { IntervalsValue = null; IntervalsDescriptor = null; @@ -266,7 +266,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o { writer.WritePropertyName("intervals"); writer.WriteStartArray(); - JsonSerializer.Serialize(writer, new IntervalsContainerDescriptor(IntervalsDescriptorAction), options); + JsonSerializer.Serialize(writer, new IntervalsDescriptor(IntervalsDescriptorAction), options); writer.WriteEndArray(); } else if (IntervalsDescriptorActions is not null) @@ -275,7 +275,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteStartArray(); foreach (var action in IntervalsDescriptorActions) { - JsonSerializer.Serialize(writer, new IntervalsContainerDescriptor(action), options); + JsonSerializer.Serialize(writer, new IntervalsDescriptor(action), options); } writer.WriteEndArray(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs index c6fc05086b9..98fe7c353ae 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs @@ -26,7 +26,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; [JsonConverter(typeof(IntervalsQueryConverter))] -public sealed partial class IntervalsQuery : Query +public sealed partial class IntervalsQuery : SearchQuery { internal object Variant { get; } @@ -65,7 +65,7 @@ internal IntervalsQuery(Field field, string variantName, object variant) [JsonPropertyName("field")] public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(IntervalsQuery intervalsQuery) => QueryContainer.Intervals(intervalsQuery); + public static implicit operator Query(IntervalsQuery intervalsQuery) => QueryDsl.Query.Intervals(intervalsQuery); } internal sealed class IntervalsQueryConverter : JsonConverter diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchAllQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchAllQuery.g.cs index 3f337cd2b8c..9c06e6e881e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchAllQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchAllQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class MatchAllQuery : Query +public sealed partial class MatchAllQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -35,7 +35,7 @@ public sealed partial class MatchAllQuery : Query [JsonPropertyName("boost")] public float? Boost { get; set; } - public static implicit operator QueryContainer(MatchAllQuery matchAllQuery) => QueryContainer.MatchAll(matchAllQuery); + public static implicit operator Query(MatchAllQuery matchAllQuery) => QueryDsl.Query.MatchAll(matchAllQuery); } public sealed partial class MatchAllQueryDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs index 759c53c7717..40d89fa1948 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs @@ -193,7 +193,7 @@ public override void Write(Utf8JsonWriter writer, MatchBoolPrefixQuery value, Js } [JsonConverter(typeof(MatchBoolPrefixQueryConverter))] -public sealed partial class MatchBoolPrefixQuery : Query +public sealed partial class MatchBoolPrefixQuery : SearchQuery { public MatchBoolPrefixQuery(Field field) { @@ -226,7 +226,7 @@ public MatchBoolPrefixQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(MatchBoolPrefixQuery matchBoolPrefixQuery) => QueryContainer.MatchBoolPrefix(matchBoolPrefixQuery); + public static implicit operator Query(MatchBoolPrefixQuery matchBoolPrefixQuery) => QueryDsl.Query.MatchBoolPrefix(matchBoolPrefixQuery); } public sealed partial class MatchBoolPrefixQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchNoneQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchNoneQuery.g.cs index 812ec63a62d..733cd31d6fc 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchNoneQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchNoneQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class MatchNoneQuery : Query +public sealed partial class MatchNoneQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -35,7 +35,7 @@ public sealed partial class MatchNoneQuery : Query [JsonPropertyName("boost")] public float? Boost { get; set; } - public static implicit operator QueryContainer(MatchNoneQuery matchNoneQuery) => QueryContainer.MatchNone(matchNoneQuery); + public static implicit operator Query(MatchNoneQuery matchNoneQuery) => QueryDsl.Query.MatchNone(matchNoneQuery); } public sealed partial class MatchNoneQueryDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs index 8a211e1564d..1884e852687 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs @@ -145,7 +145,7 @@ public override void Write(Utf8JsonWriter writer, MatchPhrasePrefixQuery value, } [JsonConverter(typeof(MatchPhrasePrefixQueryConverter))] -public sealed partial class MatchPhrasePrefixQuery : Query +public sealed partial class MatchPhrasePrefixQuery : SearchQuery { public MatchPhrasePrefixQuery(Field field) { @@ -170,7 +170,7 @@ public MatchPhrasePrefixQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => QueryContainer.MatchPhrasePrefix(matchPhrasePrefixQuery); + public static implicit operator Query(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => QueryDsl.Query.MatchPhrasePrefix(matchPhrasePrefixQuery); } public sealed partial class MatchPhrasePrefixQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs index ea855d0711d..d483d6a403b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs @@ -133,7 +133,7 @@ public override void Write(Utf8JsonWriter writer, MatchPhraseQuery value, JsonSe } [JsonConverter(typeof(MatchPhraseQueryConverter))] -public sealed partial class MatchPhraseQuery : Query +public sealed partial class MatchPhraseQuery : SearchQuery { public MatchPhraseQuery(Field field) { @@ -156,7 +156,7 @@ public MatchPhraseQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(MatchPhraseQuery matchPhraseQuery) => QueryContainer.MatchPhrase(matchPhraseQuery); + public static implicit operator Query(MatchPhraseQuery matchPhraseQuery) => QueryDsl.Query.MatchPhrase(matchPhraseQuery); } public sealed partial class MatchPhraseQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs index ac4c47fcef0..e6979f588a3 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs @@ -229,7 +229,7 @@ public override void Write(Utf8JsonWriter writer, MatchQuery value, JsonSerializ } [JsonConverter(typeof(MatchQueryConverter))] -public sealed partial class MatchQuery : Query +public sealed partial class MatchQuery : SearchQuery { public MatchQuery(Field field) { @@ -268,7 +268,7 @@ public MatchQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(MatchQuery matchQuery) => QueryContainer.Match(matchQuery); + public static implicit operator Query(MatchQuery matchQuery) => QueryDsl.Query.Match(matchQuery); } public sealed partial class MatchQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs index 91da69ab002..6803fa30ba9 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class MoreLikeThisQuery : Query +public sealed partial class MoreLikeThisQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -112,7 +112,7 @@ public sealed partial class MoreLikeThisQuery : Query [JsonPropertyName("version_type")] public Elastic.Clients.Elasticsearch.VersionType? VersionType { get; set; } - public static implicit operator QueryContainer(MoreLikeThisQuery moreLikeThisQuery) => QueryContainer.MoreLikeThis(moreLikeThisQuery); + public static implicit operator Query(MoreLikeThisQuery moreLikeThisQuery) => QueryDsl.Query.MoreLikeThis(moreLikeThisQuery); } public sealed partial class MoreLikeThisQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs index 50f1e386e52..87b56b52914 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class MultiMatchQuery : Query +public sealed partial class MultiMatchQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -99,7 +99,7 @@ public sealed partial class MultiMatchQuery : Query [JsonPropertyName("zero_terms_query")] public Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQuery { get; set; } - public static implicit operator QueryContainer(MultiMatchQuery multiMatchQuery) => QueryContainer.MultiMatch(multiMatchQuery); + public static implicit operator Query(MultiMatchQuery multiMatchQuery) => QueryDsl.Query.MultiMatch(multiMatchQuery); } public sealed partial class MultiMatchQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NestedQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NestedQuery.g.cs index 535d1f2941d..bc51b8b9878 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NestedQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NestedQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class NestedQuery : Query +public sealed partial class NestedQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -49,13 +49,13 @@ public sealed partial class NestedQuery : Query [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; } [JsonInclude] [JsonPropertyName("score_mode")] public Elastic.Clients.Elasticsearch.QueryDsl.ChildScoreMode? ScoreMode { get; set; } - public static implicit operator QueryContainer(NestedQuery nestedQuery) => QueryContainer.Nested(nestedQuery); + public static implicit operator Query(NestedQuery nestedQuery) => QueryDsl.Query.Nested(nestedQuery); } public sealed partial class NestedQueryDescriptor : SerializableDescriptor> @@ -71,11 +71,11 @@ public NestedQueryDescriptor() : base() private Action> InnerHitsDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -111,7 +111,7 @@ public NestedQueryDescriptor InnerHits(Action Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public NestedQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -119,7 +119,7 @@ public NestedQueryDescriptor Query(Elastic.Clients.Elasticsearch.Quer return Self; } - public NestedQueryDescriptor Query(QueryContainerDescriptor descriptor) + public NestedQueryDescriptor Query(QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -127,7 +127,7 @@ public NestedQueryDescriptor Query(QueryContainerDescriptor Query(Action> configure) + public NestedQueryDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -198,7 +198,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else { @@ -249,11 +249,11 @@ public NestedQueryDescriptor() : base() private Action InnerHitsDescriptorAction { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -289,7 +289,7 @@ public NestedQueryDescriptor InnerHits(Action c return Self; } - public NestedQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public NestedQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -297,7 +297,7 @@ public NestedQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryC return Self; } - public NestedQueryDescriptor Query(QueryContainerDescriptor descriptor) + public NestedQueryDescriptor Query(QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -305,7 +305,7 @@ public NestedQueryDescriptor Query(QueryContainerDescriptor descriptor) return Self; } - public NestedQueryDescriptor Query(Action configure) + public NestedQueryDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -382,7 +382,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs deleted file mode 100644 index a48977fade5..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs +++ /dev/null @@ -1,551 +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. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch.QueryDsl; -internal sealed class NumberRangeQueryConverter : JsonConverter -{ - public override NumberRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType != JsonTokenType.StartObject) - throw new JsonException("Unexpected JSON detected."); - reader.Read(); - var fieldName = reader.GetString(); - reader.Read(); - var variant = new NumberRangeQuery(fieldName); - while (reader.Read() && reader.TokenType != JsonTokenType.EndObject) - { - if (reader.TokenType == JsonTokenType.PropertyName) - { - var property = reader.GetString(); - if (property == "_name") - { - variant.QueryName = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "boost") - { - variant.Boost = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "from") - { - variant.From = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "gt") - { - variant.Gt = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "gte") - { - variant.Gte = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "lt") - { - variant.Lt = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "lte") - { - variant.Lte = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "relation") - { - variant.Relation = JsonSerializer.Deserialize(ref reader, options); - continue; - } - - if (property == "to") - { - variant.To = JsonSerializer.Deserialize(ref reader, options); - continue; - } - } - } - - reader.Read(); - return variant; - } - - public override void Write(Utf8JsonWriter writer, NumberRangeQuery value, JsonSerializerOptions options) - { - if (value.Field is null) - throw new JsonException("Unable to serialize NumberRangeQuery because the `Field` property is not set. Field name queries must include a valid field name."); - if (options.TryGetClientSettings(out var settings)) - { - writer.WriteStartObject(); - writer.WritePropertyName(settings.Inferrer.Field(value.Field)); - writer.WriteStartObject(); - if (!string.IsNullOrEmpty(value.QueryName)) - { - writer.WritePropertyName("_name"); - writer.WriteStringValue(value.QueryName); - } - - if (value.Boost.HasValue) - { - writer.WritePropertyName("boost"); - writer.WriteNumberValue(value.Boost.Value); - } - - if (value.From.HasValue) - { - writer.WritePropertyName("from"); - writer.WriteNumberValue(value.From.Value); - } - - if (value.Gt.HasValue) - { - writer.WritePropertyName("gt"); - writer.WriteNumberValue(value.Gt.Value); - } - - if (value.Gte.HasValue) - { - writer.WritePropertyName("gte"); - writer.WriteNumberValue(value.Gte.Value); - } - - if (value.Lt.HasValue) - { - writer.WritePropertyName("lt"); - writer.WriteNumberValue(value.Lt.Value); - } - - if (value.Lte.HasValue) - { - writer.WritePropertyName("lte"); - writer.WriteNumberValue(value.Lte.Value); - } - - if (value.Relation is not null) - { - writer.WritePropertyName("relation"); - JsonSerializer.Serialize(writer, value.Relation, options); - } - - if (value.To.HasValue) - { - writer.WritePropertyName("to"); - writer.WriteNumberValue(value.To.Value); - } - - writer.WriteEndObject(); - writer.WriteEndObject(); - return; - } - - throw new JsonException("Unable to retrieve client settings required to infer field."); - } -} - -[JsonConverter(typeof(NumberRangeQueryConverter))] -public sealed partial class NumberRangeQuery : Query -{ - public NumberRangeQuery(Field field) - { - if (field is null) - throw new ArgumentNullException(nameof(field)); - Field = field; - } - - public string? QueryName { get; set; } - - public float? Boost { get; set; } - - public double? From { get; set; } - - public double? Gt { get; set; } - - public double? Gte { get; set; } - - public double? Lt { get; set; } - - public double? Lte { get; set; } - - public Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? Relation { get; set; } - - public double? To { get; set; } - - public Elastic.Clients.Elasticsearch.Field Field { get; set; } - - public static implicit operator QueryContainer(NumberRangeQuery numberRangeQuery) => QueryContainer.Range(new RangeQuery(numberRangeQuery)); -} - -public sealed partial class NumberRangeQueryDescriptor : SerializableDescriptor> -{ - internal NumberRangeQueryDescriptor(Action> configure) => configure.Invoke(this); - internal NumberRangeQueryDescriptor() : base() - { - } - - public NumberRangeQueryDescriptor(Field field) - { - if (field is null) - throw new ArgumentNullException(nameof(field)); - FieldValue = field; - } - - public NumberRangeQueryDescriptor(Expression> field) - { - if (field is null) - throw new ArgumentNullException(nameof(field)); - FieldValue = field; - } - - private string? QueryNameValue { get; set; } - - private float? BoostValue { get; set; } - - private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; } - - private double? FromValue { get; set; } - - private double? GtValue { get; set; } - - private double? GteValue { get; set; } - - private double? LtValue { get; set; } - - private double? LteValue { get; set; } - - private Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? RelationValue { get; set; } - - private double? ToValue { get; set; } - - public NumberRangeQueryDescriptor QueryName(string? queryName) - { - QueryNameValue = queryName; - return Self; - } - - public NumberRangeQueryDescriptor Boost(float? boost) - { - BoostValue = boost; - return Self; - } - - public NumberRangeQueryDescriptor Field(Elastic.Clients.Elasticsearch.Field field) - { - FieldValue = field; - return Self; - } - - public NumberRangeQueryDescriptor Field(Expression> field) - { - FieldValue = field; - return Self; - } - - public NumberRangeQueryDescriptor From(double? from) - { - FromValue = from; - return Self; - } - - public NumberRangeQueryDescriptor Gt(double? gt) - { - GtValue = gt; - return Self; - } - - public NumberRangeQueryDescriptor Gte(double? gte) - { - GteValue = gte; - return Self; - } - - public NumberRangeQueryDescriptor Lt(double? lt) - { - LtValue = lt; - return Self; - } - - public NumberRangeQueryDescriptor Lte(double? lte) - { - LteValue = lte; - return Self; - } - - public NumberRangeQueryDescriptor Relation(Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? relation) - { - RelationValue = relation; - return Self; - } - - public NumberRangeQueryDescriptor To(double? to) - { - ToValue = to; - return Self; - } - - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (FieldValue is null) - throw new JsonException("Unable to serialize field name query descriptor with a null field. Ensure you use a suitable descriptor constructor or call the Field method, passing a non-null value for the field argument."); - writer.WriteStartObject(); - writer.WritePropertyName(settings.Inferrer.Field(FieldValue)); - writer.WriteStartObject(); - if (!string.IsNullOrEmpty(QueryNameValue)) - { - writer.WritePropertyName("_name"); - writer.WriteStringValue(QueryNameValue); - } - - if (BoostValue.HasValue) - { - writer.WritePropertyName("boost"); - writer.WriteNumberValue(BoostValue.Value); - } - - if (FromValue.HasValue) - { - writer.WritePropertyName("from"); - writer.WriteNumberValue(FromValue.Value); - } - - if (GtValue.HasValue) - { - writer.WritePropertyName("gt"); - writer.WriteNumberValue(GtValue.Value); - } - - if (GteValue.HasValue) - { - writer.WritePropertyName("gte"); - writer.WriteNumberValue(GteValue.Value); - } - - if (LtValue.HasValue) - { - writer.WritePropertyName("lt"); - writer.WriteNumberValue(LtValue.Value); - } - - if (LteValue.HasValue) - { - writer.WritePropertyName("lte"); - writer.WriteNumberValue(LteValue.Value); - } - - if (RelationValue is not null) - { - writer.WritePropertyName("relation"); - JsonSerializer.Serialize(writer, RelationValue, options); - } - - if (ToValue.HasValue) - { - writer.WritePropertyName("to"); - writer.WriteNumberValue(ToValue.Value); - } - - writer.WriteEndObject(); - writer.WriteEndObject(); - } -} - -public sealed partial class NumberRangeQueryDescriptor : SerializableDescriptor -{ - internal NumberRangeQueryDescriptor(Action configure) => configure.Invoke(this); - internal NumberRangeQueryDescriptor() : base() - { - } - - public NumberRangeQueryDescriptor(Field field) - { - if (field is null) - throw new ArgumentNullException(nameof(field)); - FieldValue = field; - } - - private string? QueryNameValue { get; set; } - - private float? BoostValue { get; set; } - - private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; } - - private double? FromValue { get; set; } - - private double? GtValue { get; set; } - - private double? GteValue { get; set; } - - private double? LtValue { get; set; } - - private double? LteValue { get; set; } - - private Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? RelationValue { get; set; } - - private double? ToValue { get; set; } - - public NumberRangeQueryDescriptor QueryName(string? queryName) - { - QueryNameValue = queryName; - return Self; - } - - public NumberRangeQueryDescriptor Boost(float? boost) - { - BoostValue = boost; - return Self; - } - - public NumberRangeQueryDescriptor Field(Elastic.Clients.Elasticsearch.Field field) - { - FieldValue = field; - return Self; - } - - public NumberRangeQueryDescriptor Field(Expression> field) - { - FieldValue = field; - return Self; - } - - public NumberRangeQueryDescriptor Field(Expression> field) - { - FieldValue = field; - return Self; - } - - public NumberRangeQueryDescriptor From(double? from) - { - FromValue = from; - return Self; - } - - public NumberRangeQueryDescriptor Gt(double? gt) - { - GtValue = gt; - return Self; - } - - public NumberRangeQueryDescriptor Gte(double? gte) - { - GteValue = gte; - return Self; - } - - public NumberRangeQueryDescriptor Lt(double? lt) - { - LtValue = lt; - return Self; - } - - public NumberRangeQueryDescriptor Lte(double? lte) - { - LteValue = lte; - return Self; - } - - public NumberRangeQueryDescriptor Relation(Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? relation) - { - RelationValue = relation; - return Self; - } - - public NumberRangeQueryDescriptor To(double? to) - { - ToValue = to; - return Self; - } - - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (FieldValue is null) - throw new JsonException("Unable to serialize field name query descriptor with a null field. Ensure you use a suitable descriptor constructor or call the Field method, passing a non-null value for the field argument."); - writer.WriteStartObject(); - writer.WritePropertyName(settings.Inferrer.Field(FieldValue)); - writer.WriteStartObject(); - if (!string.IsNullOrEmpty(QueryNameValue)) - { - writer.WritePropertyName("_name"); - writer.WriteStringValue(QueryNameValue); - } - - if (BoostValue.HasValue) - { - writer.WritePropertyName("boost"); - writer.WriteNumberValue(BoostValue.Value); - } - - if (FromValue.HasValue) - { - writer.WritePropertyName("from"); - writer.WriteNumberValue(FromValue.Value); - } - - if (GtValue.HasValue) - { - writer.WritePropertyName("gt"); - writer.WriteNumberValue(GtValue.Value); - } - - if (GteValue.HasValue) - { - writer.WritePropertyName("gte"); - writer.WriteNumberValue(GteValue.Value); - } - - if (LtValue.HasValue) - { - writer.WritePropertyName("lt"); - writer.WriteNumberValue(LtValue.Value); - } - - if (LteValue.HasValue) - { - writer.WritePropertyName("lte"); - writer.WriteNumberValue(LteValue.Value); - } - - if (RelationValue is not null) - { - writer.WritePropertyName("relation"); - JsonSerializer.Serialize(writer, RelationValue, options); - } - - if (ToValue.HasValue) - { - writer.WritePropertyName("to"); - writer.WriteNumberValue(ToValue.Value); - } - - writer.WriteEndObject(); - writer.WriteEndObject(); - } -} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ParentIdQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ParentIdQuery.g.cs index 434187d9254..d1f55ac1df0 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ParentIdQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ParentIdQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class ParentIdQuery : Query +public sealed partial class ParentIdQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -47,7 +47,7 @@ public sealed partial class ParentIdQuery : Query [JsonPropertyName("type")] public string? Type { get; set; } - public static implicit operator QueryContainer(ParentIdQuery parentIdQuery) => QueryContainer.ParentId(parentIdQuery); + public static implicit operator Query(ParentIdQuery parentIdQuery) => QueryDsl.Query.ParentId(parentIdQuery); } public sealed partial class ParentIdQueryDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PercolateQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PercolateQuery.g.cs index 5c114cc3e25..6cbde3855dc 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PercolateQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PercolateQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class PercolateQuery : Query +public sealed partial class PercolateQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -71,7 +71,7 @@ public sealed partial class PercolateQuery : Query [JsonPropertyName("version")] public long? Version { get; set; } - public static implicit operator QueryContainer(PercolateQuery percolateQuery) => QueryContainer.Percolate(percolateQuery); + public static implicit operator Query(PercolateQuery percolateQuery) => QueryDsl.Query.Percolate(percolateQuery); } public sealed partial class PercolateQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs index 7b08df5be41..7891d9ede26 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs @@ -121,7 +121,7 @@ public override void Write(Utf8JsonWriter writer, PrefixQuery value, JsonSeriali } [JsonConverter(typeof(PrefixQueryConverter))] -public sealed partial class PrefixQuery : Query +public sealed partial class PrefixQuery : SearchQuery { public PrefixQuery(Field field) { @@ -142,7 +142,7 @@ public PrefixQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(PrefixQuery prefixQuery) => QueryContainer.Prefix(prefixQuery); + public static implicit operator Query(PrefixQuery prefixQuery) => QueryDsl.Query.Prefix(prefixQuery); } public sealed partial class PrefixQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs new file mode 100644 index 00000000000..913f8161667 --- /dev/null +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs @@ -0,0 +1,889 @@ +// 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. +// +// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ +// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ +// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ +// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ +// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ +// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ +// ------------------------------------------------ +// +// This file is automatically generated. +// Please do not edit these files manually. +// +// ------------------------------------------------ + +using Elastic.Clients.Elasticsearch.Fluent; +using Elastic.Clients.Elasticsearch.Serialization; +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Text.Json; +using System.Text.Json.Serialization; + +#nullable restore +namespace Elastic.Clients.Elasticsearch.QueryDsl; +[JsonConverter(typeof(QueryConverter))] +public sealed partial class Query +{ + internal Query(string variantName, object variant) + { + if (variantName is null) + throw new ArgumentNullException(nameof(variantName)); + if (variant is null) + throw new ArgumentNullException(nameof(variant)); + if (string.IsNullOrWhiteSpace(variantName)) + throw new ArgumentException("Variant name must not be empty or whitespace."); + VariantName = variantName; + Variant = variant; + } + + internal object Variant { get; } + + internal string VariantName { get; } + + public static Query Bool(Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery boolQuery) => new Query("bool", boolQuery); + public static Query Boosting(Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery boostingQuery) => new Query("boosting", boostingQuery); + public static Query CombinedFields(Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery combinedFieldsQuery) => new Query("combined_fields", combinedFieldsQuery); + public static Query ConstantScore(Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery constantScoreQuery) => new Query("constant_score", constantScoreQuery); + public static Query DisMax(Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery disMaxQuery) => new Query("dis_max", disMaxQuery); + public static Query Exists(Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery existsQuery) => new Query("exists", existsQuery); + public static Query FieldMaskingSpan(Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery spanFieldMaskingQuery) => new Query("field_masking_span", spanFieldMaskingQuery); + public static Query FunctionScore(Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery functionScoreQuery) => new Query("function_score", functionScoreQuery); + public static Query Fuzzy(Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery fuzzyQuery) => new Query("fuzzy", fuzzyQuery); + public static Query HasChild(Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery hasChildQuery) => new Query("has_child", hasChildQuery); + public static Query HasParent(Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery hasParentQuery) => new Query("has_parent", hasParentQuery); + public static Query Ids(Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery idsQuery) => new Query("ids", idsQuery); + public static Query Intervals(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery intervalsQuery) => new Query("intervals", intervalsQuery); + public static Query Match(Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery matchQuery) => new Query("match", matchQuery); + public static Query MatchAll(Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery matchAllQuery) => new Query("match_all", matchAllQuery); + public static Query MatchBoolPrefix(Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery matchBoolPrefixQuery) => new Query("match_bool_prefix", matchBoolPrefixQuery); + public static Query MatchNone(Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery matchNoneQuery) => new Query("match_none", matchNoneQuery); + public static Query MatchPhrase(Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery matchPhraseQuery) => new Query("match_phrase", matchPhraseQuery); + public static Query MatchPhrasePrefix(Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery matchPhrasePrefixQuery) => new Query("match_phrase_prefix", matchPhrasePrefixQuery); + public static Query MoreLikeThis(Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery moreLikeThisQuery) => new Query("more_like_this", moreLikeThisQuery); + public static Query MultiMatch(Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery multiMatchQuery) => new Query("multi_match", multiMatchQuery); + public static Query Nested(Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery nestedQuery) => new Query("nested", nestedQuery); + public static Query ParentId(Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery parentIdQuery) => new Query("parent_id", parentIdQuery); + public static Query Percolate(Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery percolateQuery) => new Query("percolate", percolateQuery); + public static Query Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => new Query("prefix", prefixQuery); + public static Query QueryString(Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery queryStringQuery) => new Query("query_string", queryStringQuery); + public static Query RankFeature(Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery rankFeatureQuery) => new Query("rank_feature", rankFeatureQuery); + public static Query Regexp(Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery regexpQuery) => new Query("regexp", regexpQuery); + public static Query Script(Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery scriptQuery) => new Query("script", scriptQuery); + public static Query ScriptScore(Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery scriptScoreQuery) => new Query("script_score", scriptScoreQuery); + public static Query SimpleQueryString(Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery simpleQueryStringQuery) => new Query("simple_query_string", simpleQueryStringQuery); + public static Query SpanContaining(Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery spanContainingQuery) => new Query("span_containing", spanContainingQuery); + public static Query SpanFirst(Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery spanFirstQuery) => new Query("span_first", spanFirstQuery); + public static Query SpanMulti(Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery spanMultiTermQuery) => new Query("span_multi", spanMultiTermQuery); + public static Query SpanNear(Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery spanNearQuery) => new Query("span_near", spanNearQuery); + public static Query SpanNot(Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery spanNotQuery) => new Query("span_not", spanNotQuery); + public static Query SpanOr(Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery spanOrQuery) => new Query("span_or", spanOrQuery); + public static Query SpanTerm(Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery spanTermQuery) => new Query("span_term", spanTermQuery); + public static Query SpanWithin(Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery spanWithinQuery) => new Query("span_within", spanWithinQuery); + public static Query Term(Elastic.Clients.Elasticsearch.QueryDsl.TermQuery termQuery) => new Query("term", termQuery); + public static Query Terms(Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery termsQuery) => new Query("terms", termsQuery); + public static Query TermsSet(Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery termsSetQuery) => new Query("terms_set", termsSetQuery); + public static Query Wildcard(Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery wildcardQuery) => new Query("wildcard", wildcardQuery); + public static Query Wrapper(Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery wrapperQuery) => new Query("wrapper", wrapperQuery); +} + +internal sealed class QueryConverter : JsonConverter +{ + public override Query Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType != JsonTokenType.StartObject) + { + throw new JsonException("Expected start token."); + } + + reader.Read(); + if (reader.TokenType != JsonTokenType.PropertyName) + { + throw new JsonException("Expected a property name token representing the variant held within this container."); + } + + var propertyName = reader.GetString(); + reader.Read(); + if (propertyName == "bool") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "boosting") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "combined_fields") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "constant_score") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "dis_max") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "exists") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "field_masking_span") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "function_score") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "fuzzy") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "has_child") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "has_parent") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "ids") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "intervals") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "match") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "match_all") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "match_bool_prefix") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "match_none") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "match_phrase") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "match_phrase_prefix") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "more_like_this") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "multi_match") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "nested") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "parent_id") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "percolate") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "prefix") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "query_string") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "rank_feature") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "regexp") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "script") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "script_score") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "simple_query_string") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "span_containing") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "span_first") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "span_multi") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "span_near") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "span_not") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "span_or") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "span_term") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "span_within") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "term") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "terms") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "terms_set") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "wildcard") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + if (propertyName == "wrapper") + { + var variant = JsonSerializer.Deserialize(ref reader, options); + reader.Read(); + return new Query(propertyName, variant); + } + + throw new JsonException(); + } + + public override void Write(Utf8JsonWriter writer, Query value, JsonSerializerOptions options) + { + writer.WriteStartObject(); + writer.WritePropertyName(value.VariantName); + switch (value.VariantName) + { + case "bool": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery)value.Variant, options); + break; + case "boosting": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery)value.Variant, options); + break; + case "combined_fields": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery)value.Variant, options); + break; + case "constant_score": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery)value.Variant, options); + break; + case "dis_max": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery)value.Variant, options); + break; + case "exists": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery)value.Variant, options); + break; + case "field_masking_span": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery)value.Variant, options); + break; + case "function_score": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery)value.Variant, options); + break; + case "fuzzy": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery)value.Variant, options); + break; + case "has_child": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery)value.Variant, options); + break; + case "has_parent": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery)value.Variant, options); + break; + case "ids": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery)value.Variant, options); + break; + case "intervals": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery)value.Variant, options); + break; + case "match": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery)value.Variant, options); + break; + case "match_all": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery)value.Variant, options); + break; + case "match_bool_prefix": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery)value.Variant, options); + break; + case "match_none": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery)value.Variant, options); + break; + case "match_phrase": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery)value.Variant, options); + break; + case "match_phrase_prefix": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery)value.Variant, options); + break; + case "more_like_this": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery)value.Variant, options); + break; + case "multi_match": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery)value.Variant, options); + break; + case "nested": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery)value.Variant, options); + break; + case "parent_id": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery)value.Variant, options); + break; + case "percolate": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery)value.Variant, options); + break; + case "prefix": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery)value.Variant, options); + break; + case "query_string": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery)value.Variant, options); + break; + case "rank_feature": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery)value.Variant, options); + break; + case "regexp": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery)value.Variant, options); + break; + case "script": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery)value.Variant, options); + break; + case "script_score": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery)value.Variant, options); + break; + case "simple_query_string": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery)value.Variant, options); + break; + case "span_containing": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery)value.Variant, options); + break; + case "span_first": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery)value.Variant, options); + break; + case "span_multi": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery)value.Variant, options); + break; + case "span_near": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery)value.Variant, options); + break; + case "span_not": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery)value.Variant, options); + break; + case "span_or": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery)value.Variant, options); + break; + case "span_term": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery)value.Variant, options); + break; + case "span_within": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery)value.Variant, options); + break; + case "term": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery)value.Variant, options); + break; + case "terms": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery)value.Variant, options); + break; + case "terms_set": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery)value.Variant, options); + break; + case "wildcard": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery)value.Variant, options); + break; + case "wrapper": + JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery)value.Variant, options); + break; + } + + writer.WriteEndObject(); + } +} + +public sealed partial class QueryDescriptor : SerializableDescriptor> +{ + internal QueryDescriptor(Action> configure) => configure.Invoke(this); + public QueryDescriptor() : base() + { + } + + private bool ContainsVariant { get; set; } + + private string ContainedVariantName { get; set; } + + private object Variant { get; set; } + + private Descriptor Descriptor { get; set; } + + private QueryDescriptor Set(Action descriptorAction, string variantName) + where T : Descriptor + { + ContainedVariantName = variantName; + ContainsVariant = true; + var descriptor = (T)Activator.CreateInstance(typeof(T), true); + descriptorAction?.Invoke(descriptor); + Descriptor = descriptor; + return Self; + } + + private QueryDescriptor Set(object variant, string variantName) + { + Variant = variant; + ContainedVariantName = variantName; + ContainsVariant = true; + return Self; + } + + public QueryDescriptor Bool(BoolQuery boolQuery) => Set(boolQuery, "bool"); + public QueryDescriptor Bool(Action> configure) => Set(configure, "bool"); + public QueryDescriptor Boosting(BoostingQuery boostingQuery) => Set(boostingQuery, "boosting"); + public QueryDescriptor Boosting(Action> configure) => Set(configure, "boosting"); + public QueryDescriptor CombinedFields(CombinedFieldsQuery combinedFieldsQuery) => Set(combinedFieldsQuery, "combined_fields"); + public QueryDescriptor CombinedFields(Action> configure) => Set(configure, "combined_fields"); + public QueryDescriptor ConstantScore(ConstantScoreQuery constantScoreQuery) => Set(constantScoreQuery, "constant_score"); + public QueryDescriptor ConstantScore(Action> configure) => Set(configure, "constant_score"); + public QueryDescriptor DisMax(DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max"); + public QueryDescriptor DisMax(Action> configure) => Set(configure, "dis_max"); + public QueryDescriptor Exists(ExistsQuery existsQuery) => Set(existsQuery, "exists"); + public QueryDescriptor Exists(Action> configure) => Set(configure, "exists"); + public QueryDescriptor FieldMaskingSpan(SpanFieldMaskingQuery spanFieldMaskingQuery) => Set(spanFieldMaskingQuery, "field_masking_span"); + public QueryDescriptor FieldMaskingSpan(Action> configure) => Set(configure, "field_masking_span"); + public QueryDescriptor FunctionScore(FunctionScoreQuery functionScoreQuery) => Set(functionScoreQuery, "function_score"); + public QueryDescriptor FunctionScore(Action> configure) => Set(configure, "function_score"); + public QueryDescriptor Fuzzy(FuzzyQuery fuzzyQuery) => Set(fuzzyQuery, "fuzzy"); + public QueryDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); + public QueryDescriptor HasChild(HasChildQuery hasChildQuery) => Set(hasChildQuery, "has_child"); + public QueryDescriptor HasChild(Action> configure) => Set(configure, "has_child"); + public QueryDescriptor HasParent(HasParentQuery hasParentQuery) => Set(hasParentQuery, "has_parent"); + public QueryDescriptor HasParent(Action> configure) => Set(configure, "has_parent"); + public QueryDescriptor Ids(IdsQuery idsQuery) => Set(idsQuery, "ids"); + public QueryDescriptor Ids(Action configure) => Set(configure, "ids"); + public QueryDescriptor Intervals(IntervalsQuery intervalsQuery) => Set(intervalsQuery, "intervals"); + public QueryDescriptor Intervals(Action> configure) => Set(configure, "intervals"); + public QueryDescriptor Match(MatchQuery matchQuery) => Set(matchQuery, "match"); + public QueryDescriptor Match(Action> configure) => Set(configure, "match"); + public QueryDescriptor MatchAll(MatchAllQuery matchAllQuery) => Set(matchAllQuery, "match_all"); + public QueryDescriptor MatchAll(Action configure) => Set(configure, "match_all"); + public QueryDescriptor MatchBoolPrefix(MatchBoolPrefixQuery matchBoolPrefixQuery) => Set(matchBoolPrefixQuery, "match_bool_prefix"); + public QueryDescriptor MatchBoolPrefix(Action> configure) => Set(configure, "match_bool_prefix"); + public QueryDescriptor MatchNone(MatchNoneQuery matchNoneQuery) => Set(matchNoneQuery, "match_none"); + public QueryDescriptor MatchNone(Action configure) => Set(configure, "match_none"); + public QueryDescriptor MatchPhrase(MatchPhraseQuery matchPhraseQuery) => Set(matchPhraseQuery, "match_phrase"); + public QueryDescriptor MatchPhrase(Action> configure) => Set(configure, "match_phrase"); + public QueryDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => Set(matchPhrasePrefixQuery, "match_phrase_prefix"); + public QueryDescriptor MatchPhrasePrefix(Action> configure) => Set(configure, "match_phrase_prefix"); + public QueryDescriptor MoreLikeThis(MoreLikeThisQuery moreLikeThisQuery) => Set(moreLikeThisQuery, "more_like_this"); + public QueryDescriptor MoreLikeThis(Action> configure) => Set(configure, "more_like_this"); + public QueryDescriptor MultiMatch(MultiMatchQuery multiMatchQuery) => Set(multiMatchQuery, "multi_match"); + public QueryDescriptor MultiMatch(Action> configure) => Set(configure, "multi_match"); + public QueryDescriptor Nested(NestedQuery nestedQuery) => Set(nestedQuery, "nested"); + public QueryDescriptor Nested(Action> configure) => Set(configure, "nested"); + public QueryDescriptor ParentId(ParentIdQuery parentIdQuery) => Set(parentIdQuery, "parent_id"); + public QueryDescriptor ParentId(Action configure) => Set(configure, "parent_id"); + public QueryDescriptor Percolate(PercolateQuery percolateQuery) => Set(percolateQuery, "percolate"); + public QueryDescriptor Percolate(Action> configure) => Set(configure, "percolate"); + public QueryDescriptor Prefix(PrefixQuery prefixQuery) => Set(prefixQuery, "prefix"); + public QueryDescriptor Prefix(Action> configure) => Set(configure, "prefix"); + public QueryDescriptor QueryString(QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string"); + public QueryDescriptor QueryString(Action> configure) => Set(configure, "query_string"); + public QueryDescriptor RankFeature(RankFeatureQuery rankFeatureQuery) => Set(rankFeatureQuery, "rank_feature"); + public QueryDescriptor RankFeature(Action> configure) => Set(configure, "rank_feature"); + public QueryDescriptor Regexp(RegexpQuery regexpQuery) => Set(regexpQuery, "regexp"); + public QueryDescriptor Regexp(Action> configure) => Set(configure, "regexp"); + public QueryDescriptor Script(ScriptQuery scriptQuery) => Set(scriptQuery, "script"); + public QueryDescriptor Script(Action configure) => Set(configure, "script"); + public QueryDescriptor ScriptScore(ScriptScoreQuery scriptScoreQuery) => Set(scriptScoreQuery, "script_score"); + public QueryDescriptor ScriptScore(Action> configure) => Set(configure, "script_score"); + public QueryDescriptor SimpleQueryString(SimpleQueryStringQuery simpleQueryStringQuery) => Set(simpleQueryStringQuery, "simple_query_string"); + public QueryDescriptor SimpleQueryString(Action> configure) => Set(configure, "simple_query_string"); + public QueryDescriptor SpanContaining(SpanContainingQuery spanContainingQuery) => Set(spanContainingQuery, "span_containing"); + public QueryDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); + public QueryDescriptor SpanFirst(SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); + public QueryDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); + public QueryDescriptor SpanMulti(SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); + public QueryDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); + public QueryDescriptor SpanNear(SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); + public QueryDescriptor SpanNear(Action> configure) => Set(configure, "span_near"); + public QueryDescriptor SpanNot(SpanNotQuery spanNotQuery) => Set(spanNotQuery, "span_not"); + public QueryDescriptor SpanNot(Action> configure) => Set(configure, "span_not"); + public QueryDescriptor SpanOr(SpanOrQuery spanOrQuery) => Set(spanOrQuery, "span_or"); + public QueryDescriptor SpanOr(Action> configure) => Set(configure, "span_or"); + public QueryDescriptor SpanTerm(SpanTermQuery spanTermQuery) => Set(spanTermQuery, "span_term"); + public QueryDescriptor SpanTerm(Action> configure) => Set(configure, "span_term"); + public QueryDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within"); + public QueryDescriptor SpanWithin(Action> configure) => Set(configure, "span_within"); + public QueryDescriptor Term(TermQuery termQuery) => Set(termQuery, "term"); + public QueryDescriptor Term(Action> configure) => Set(configure, "term"); + public QueryDescriptor Terms(TermsQuery termsQuery) => Set(termsQuery, "terms"); + public QueryDescriptor Terms(Action> configure) => Set(configure, "terms"); + public QueryDescriptor TermsSet(TermsSetQuery termsSetQuery) => Set(termsSetQuery, "terms_set"); + public QueryDescriptor TermsSet(Action> configure) => Set(configure, "terms_set"); + public QueryDescriptor Wildcard(WildcardQuery wildcardQuery) => Set(wildcardQuery, "wildcard"); + public QueryDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); + public QueryDescriptor Wrapper(WrapperQuery wrapperQuery) => Set(wrapperQuery, "wrapper"); + public QueryDescriptor Wrapper(Action configure) => Set(configure, "wrapper"); + protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) + { + if (!ContainsVariant) + { + writer.WriteNullValue(); + return; + } + + writer.WriteStartObject(); + writer.WritePropertyName(ContainedVariantName); + if (Variant is not null) + { + JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); + writer.WriteEndObject(); + return; + } + + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + } +} + +public sealed partial class QueryDescriptor : SerializableDescriptor +{ + internal QueryDescriptor(Action configure) => configure.Invoke(this); + public QueryDescriptor() : base() + { + } + + private bool ContainsVariant { get; set; } + + private string ContainedVariantName { get; set; } + + private object Variant { get; set; } + + private Descriptor Descriptor { get; set; } + + private QueryDescriptor Set(Action descriptorAction, string variantName) + where T : Descriptor + { + ContainedVariantName = variantName; + ContainsVariant = true; + var descriptor = (T)Activator.CreateInstance(typeof(T), true); + descriptorAction?.Invoke(descriptor); + Descriptor = descriptor; + return Self; + } + + private QueryDescriptor Set(object variant, string variantName) + { + Variant = variant; + ContainedVariantName = variantName; + ContainsVariant = true; + return Self; + } + + public QueryDescriptor Bool(BoolQuery boolQuery) => Set(boolQuery, "bool"); + public QueryDescriptor Bool(Action configure) => Set(configure, "bool"); + public QueryDescriptor Bool(Action> configure) => Set(configure, "bool"); + public QueryDescriptor Boosting(BoostingQuery boostingQuery) => Set(boostingQuery, "boosting"); + public QueryDescriptor Boosting(Action configure) => Set(configure, "boosting"); + public QueryDescriptor Boosting(Action> configure) => Set(configure, "boosting"); + public QueryDescriptor CombinedFields(CombinedFieldsQuery combinedFieldsQuery) => Set(combinedFieldsQuery, "combined_fields"); + public QueryDescriptor CombinedFields(Action configure) => Set(configure, "combined_fields"); + public QueryDescriptor CombinedFields(Action> configure) => Set(configure, "combined_fields"); + public QueryDescriptor ConstantScore(ConstantScoreQuery constantScoreQuery) => Set(constantScoreQuery, "constant_score"); + public QueryDescriptor ConstantScore(Action configure) => Set(configure, "constant_score"); + public QueryDescriptor ConstantScore(Action> configure) => Set(configure, "constant_score"); + public QueryDescriptor DisMax(DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max"); + public QueryDescriptor DisMax(Action configure) => Set(configure, "dis_max"); + public QueryDescriptor DisMax(Action> configure) => Set(configure, "dis_max"); + public QueryDescriptor Exists(ExistsQuery existsQuery) => Set(existsQuery, "exists"); + public QueryDescriptor Exists(Action configure) => Set(configure, "exists"); + public QueryDescriptor Exists(Action> configure) => Set(configure, "exists"); + public QueryDescriptor FieldMaskingSpan(SpanFieldMaskingQuery spanFieldMaskingQuery) => Set(spanFieldMaskingQuery, "field_masking_span"); + public QueryDescriptor FieldMaskingSpan(Action configure) => Set(configure, "field_masking_span"); + public QueryDescriptor FieldMaskingSpan(Action> configure) => Set(configure, "field_masking_span"); + public QueryDescriptor FunctionScore(FunctionScoreQuery functionScoreQuery) => Set(functionScoreQuery, "function_score"); + public QueryDescriptor FunctionScore(Action configure) => Set(configure, "function_score"); + public QueryDescriptor FunctionScore(Action> configure) => Set(configure, "function_score"); + public QueryDescriptor Fuzzy(FuzzyQuery fuzzyQuery) => Set(fuzzyQuery, "fuzzy"); + public QueryDescriptor Fuzzy(Action configure) => Set(configure, "fuzzy"); + public QueryDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); + public QueryDescriptor HasChild(HasChildQuery hasChildQuery) => Set(hasChildQuery, "has_child"); + public QueryDescriptor HasChild(Action configure) => Set(configure, "has_child"); + public QueryDescriptor HasChild(Action> configure) => Set(configure, "has_child"); + public QueryDescriptor HasParent(HasParentQuery hasParentQuery) => Set(hasParentQuery, "has_parent"); + public QueryDescriptor HasParent(Action configure) => Set(configure, "has_parent"); + public QueryDescriptor HasParent(Action> configure) => Set(configure, "has_parent"); + public QueryDescriptor Ids(IdsQuery idsQuery) => Set(idsQuery, "ids"); + public QueryDescriptor Ids(Action configure) => Set(configure, "ids"); + public QueryDescriptor Intervals(IntervalsQuery intervalsQuery) => Set(intervalsQuery, "intervals"); + public QueryDescriptor Intervals(Action configure) => Set(configure, "intervals"); + public QueryDescriptor Intervals(Action> configure) => Set(configure, "intervals"); + public QueryDescriptor Match(MatchQuery matchQuery) => Set(matchQuery, "match"); + public QueryDescriptor Match(Action configure) => Set(configure, "match"); + public QueryDescriptor Match(Action> configure) => Set(configure, "match"); + public QueryDescriptor MatchAll(MatchAllQuery matchAllQuery) => Set(matchAllQuery, "match_all"); + public QueryDescriptor MatchAll(Action configure) => Set(configure, "match_all"); + public QueryDescriptor MatchBoolPrefix(MatchBoolPrefixQuery matchBoolPrefixQuery) => Set(matchBoolPrefixQuery, "match_bool_prefix"); + public QueryDescriptor MatchBoolPrefix(Action configure) => Set(configure, "match_bool_prefix"); + public QueryDescriptor MatchBoolPrefix(Action> configure) => Set(configure, "match_bool_prefix"); + public QueryDescriptor MatchNone(MatchNoneQuery matchNoneQuery) => Set(matchNoneQuery, "match_none"); + public QueryDescriptor MatchNone(Action configure) => Set(configure, "match_none"); + public QueryDescriptor MatchPhrase(MatchPhraseQuery matchPhraseQuery) => Set(matchPhraseQuery, "match_phrase"); + public QueryDescriptor MatchPhrase(Action configure) => Set(configure, "match_phrase"); + public QueryDescriptor MatchPhrase(Action> configure) => Set(configure, "match_phrase"); + public QueryDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => Set(matchPhrasePrefixQuery, "match_phrase_prefix"); + public QueryDescriptor MatchPhrasePrefix(Action configure) => Set(configure, "match_phrase_prefix"); + public QueryDescriptor MatchPhrasePrefix(Action> configure) => Set(configure, "match_phrase_prefix"); + public QueryDescriptor MoreLikeThis(MoreLikeThisQuery moreLikeThisQuery) => Set(moreLikeThisQuery, "more_like_this"); + public QueryDescriptor MoreLikeThis(Action configure) => Set(configure, "more_like_this"); + public QueryDescriptor MoreLikeThis(Action> configure) => Set(configure, "more_like_this"); + public QueryDescriptor MultiMatch(MultiMatchQuery multiMatchQuery) => Set(multiMatchQuery, "multi_match"); + public QueryDescriptor MultiMatch(Action configure) => Set(configure, "multi_match"); + public QueryDescriptor MultiMatch(Action> configure) => Set(configure, "multi_match"); + public QueryDescriptor Nested(NestedQuery nestedQuery) => Set(nestedQuery, "nested"); + public QueryDescriptor Nested(Action configure) => Set(configure, "nested"); + public QueryDescriptor Nested(Action> configure) => Set(configure, "nested"); + public QueryDescriptor ParentId(ParentIdQuery parentIdQuery) => Set(parentIdQuery, "parent_id"); + public QueryDescriptor ParentId(Action configure) => Set(configure, "parent_id"); + public QueryDescriptor Percolate(PercolateQuery percolateQuery) => Set(percolateQuery, "percolate"); + public QueryDescriptor Percolate(Action configure) => Set(configure, "percolate"); + public QueryDescriptor Percolate(Action> configure) => Set(configure, "percolate"); + public QueryDescriptor Prefix(PrefixQuery prefixQuery) => Set(prefixQuery, "prefix"); + public QueryDescriptor Prefix(Action configure) => Set(configure, "prefix"); + public QueryDescriptor Prefix(Action> configure) => Set(configure, "prefix"); + public QueryDescriptor QueryString(QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string"); + public QueryDescriptor QueryString(Action configure) => Set(configure, "query_string"); + public QueryDescriptor QueryString(Action> configure) => Set(configure, "query_string"); + public QueryDescriptor RankFeature(RankFeatureQuery rankFeatureQuery) => Set(rankFeatureQuery, "rank_feature"); + public QueryDescriptor RankFeature(Action configure) => Set(configure, "rank_feature"); + public QueryDescriptor RankFeature(Action> configure) => Set(configure, "rank_feature"); + public QueryDescriptor Regexp(RegexpQuery regexpQuery) => Set(regexpQuery, "regexp"); + public QueryDescriptor Regexp(Action configure) => Set(configure, "regexp"); + public QueryDescriptor Regexp(Action> configure) => Set(configure, "regexp"); + public QueryDescriptor Script(ScriptQuery scriptQuery) => Set(scriptQuery, "script"); + public QueryDescriptor Script(Action configure) => Set(configure, "script"); + public QueryDescriptor ScriptScore(ScriptScoreQuery scriptScoreQuery) => Set(scriptScoreQuery, "script_score"); + public QueryDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); + public QueryDescriptor ScriptScore(Action> configure) => Set(configure, "script_score"); + public QueryDescriptor SimpleQueryString(SimpleQueryStringQuery simpleQueryStringQuery) => Set(simpleQueryStringQuery, "simple_query_string"); + public QueryDescriptor SimpleQueryString(Action configure) => Set(configure, "simple_query_string"); + public QueryDescriptor SimpleQueryString(Action> configure) => Set(configure, "simple_query_string"); + public QueryDescriptor SpanContaining(SpanContainingQuery spanContainingQuery) => Set(spanContainingQuery, "span_containing"); + public QueryDescriptor SpanContaining(Action configure) => Set(configure, "span_containing"); + public QueryDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); + public QueryDescriptor SpanFirst(SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); + public QueryDescriptor SpanFirst(Action configure) => Set(configure, "span_first"); + public QueryDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); + public QueryDescriptor SpanMulti(SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); + public QueryDescriptor SpanMulti(Action configure) => Set(configure, "span_multi"); + public QueryDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); + public QueryDescriptor SpanNear(SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); + public QueryDescriptor SpanNear(Action configure) => Set(configure, "span_near"); + public QueryDescriptor SpanNear(Action> configure) => Set(configure, "span_near"); + public QueryDescriptor SpanNot(SpanNotQuery spanNotQuery) => Set(spanNotQuery, "span_not"); + public QueryDescriptor SpanNot(Action configure) => Set(configure, "span_not"); + public QueryDescriptor SpanNot(Action> configure) => Set(configure, "span_not"); + public QueryDescriptor SpanOr(SpanOrQuery spanOrQuery) => Set(spanOrQuery, "span_or"); + public QueryDescriptor SpanOr(Action configure) => Set(configure, "span_or"); + public QueryDescriptor SpanOr(Action> configure) => Set(configure, "span_or"); + public QueryDescriptor SpanTerm(SpanTermQuery spanTermQuery) => Set(spanTermQuery, "span_term"); + public QueryDescriptor SpanTerm(Action configure) => Set(configure, "span_term"); + public QueryDescriptor SpanTerm(Action> configure) => Set(configure, "span_term"); + public QueryDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within"); + public QueryDescriptor SpanWithin(Action configure) => Set(configure, "span_within"); + public QueryDescriptor SpanWithin(Action> configure) => Set(configure, "span_within"); + public QueryDescriptor Term(TermQuery termQuery) => Set(termQuery, "term"); + public QueryDescriptor Term(Action configure) => Set(configure, "term"); + public QueryDescriptor Term(Action> configure) => Set(configure, "term"); + public QueryDescriptor Terms(TermsQuery termsQuery) => Set(termsQuery, "terms"); + public QueryDescriptor Terms(Action configure) => Set(configure, "terms"); + public QueryDescriptor Terms(Action> configure) => Set(configure, "terms"); + public QueryDescriptor TermsSet(TermsSetQuery termsSetQuery) => Set(termsSetQuery, "terms_set"); + public QueryDescriptor TermsSet(Action configure) => Set(configure, "terms_set"); + public QueryDescriptor TermsSet(Action> configure) => Set(configure, "terms_set"); + public QueryDescriptor Wildcard(WildcardQuery wildcardQuery) => Set(wildcardQuery, "wildcard"); + public QueryDescriptor Wildcard(Action configure) => Set(configure, "wildcard"); + public QueryDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); + public QueryDescriptor Wrapper(WrapperQuery wrapperQuery) => Set(wrapperQuery, "wrapper"); + public QueryDescriptor Wrapper(Action configure) => Set(configure, "wrapper"); + protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) + { + if (!ContainsVariant) + { + writer.WriteNullValue(); + return; + } + + writer.WriteStartObject(); + writer.WritePropertyName(ContainedVariantName); + if (Variant is not null) + { + JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); + writer.WriteEndObject(); + return; + } + + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + } +} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs deleted file mode 100644 index aaa3a7280bc..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs +++ /dev/null @@ -1,902 +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. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch.QueryDsl; -[JsonConverter(typeof(QueryContainerConverter))] -public sealed partial class QueryContainer -{ - internal QueryContainer(string variantName, object variant) - { - if (variantName is null) - throw new ArgumentNullException(nameof(variantName)); - if (variant is null) - throw new ArgumentNullException(nameof(variant)); - if (string.IsNullOrWhiteSpace(variantName)) - throw new ArgumentException("Variant name must not be empty or whitespace."); - VariantName = variantName; - Variant = variant; - } - - internal object Variant { get; } - - internal string VariantName { get; } - - public static QueryContainer Bool(Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery boolQuery) => new QueryContainer("bool", boolQuery); - public static QueryContainer Boosting(Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery boostingQuery) => new QueryContainer("boosting", boostingQuery); - public static QueryContainer CombinedFields(Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery combinedFieldsQuery) => new QueryContainer("combined_fields", combinedFieldsQuery); - public static QueryContainer ConstantScore(Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery constantScoreQuery) => new QueryContainer("constant_score", constantScoreQuery); - public static QueryContainer DisMax(Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery disMaxQuery) => new QueryContainer("dis_max", disMaxQuery); - public static QueryContainer Exists(Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery existsQuery) => new QueryContainer("exists", existsQuery); - public static QueryContainer FieldMaskingSpan(Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery spanFieldMaskingQuery) => new QueryContainer("field_masking_span", spanFieldMaskingQuery); - public static QueryContainer FunctionScore(Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery functionScoreQuery) => new QueryContainer("function_score", functionScoreQuery); - public static QueryContainer Fuzzy(Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery fuzzyQuery) => new QueryContainer("fuzzy", fuzzyQuery); - public static QueryContainer HasChild(Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery hasChildQuery) => new QueryContainer("has_child", hasChildQuery); - public static QueryContainer HasParent(Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery hasParentQuery) => new QueryContainer("has_parent", hasParentQuery); - public static QueryContainer Ids(Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery idsQuery) => new QueryContainer("ids", idsQuery); - public static QueryContainer Intervals(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery intervalsQuery) => new QueryContainer("intervals", intervalsQuery); - public static QueryContainer Match(Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery matchQuery) => new QueryContainer("match", matchQuery); - public static QueryContainer MatchAll(Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery matchAllQuery) => new QueryContainer("match_all", matchAllQuery); - public static QueryContainer MatchBoolPrefix(Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery matchBoolPrefixQuery) => new QueryContainer("match_bool_prefix", matchBoolPrefixQuery); - public static QueryContainer MatchNone(Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery matchNoneQuery) => new QueryContainer("match_none", matchNoneQuery); - public static QueryContainer MatchPhrase(Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery matchPhraseQuery) => new QueryContainer("match_phrase", matchPhraseQuery); - public static QueryContainer MatchPhrasePrefix(Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery matchPhrasePrefixQuery) => new QueryContainer("match_phrase_prefix", matchPhrasePrefixQuery); - public static QueryContainer MoreLikeThis(Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery moreLikeThisQuery) => new QueryContainer("more_like_this", moreLikeThisQuery); - public static QueryContainer MultiMatch(Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery multiMatchQuery) => new QueryContainer("multi_match", multiMatchQuery); - public static QueryContainer Nested(Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery nestedQuery) => new QueryContainer("nested", nestedQuery); - public static QueryContainer ParentId(Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery parentIdQuery) => new QueryContainer("parent_id", parentIdQuery); - public static QueryContainer Percolate(Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery percolateQuery) => new QueryContainer("percolate", percolateQuery); - public static QueryContainer Prefix(Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery prefixQuery) => new QueryContainer("prefix", prefixQuery); - public static QueryContainer QueryString(Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery queryStringQuery) => new QueryContainer("query_string", queryStringQuery); - public static QueryContainer Range(Elastic.Clients.Elasticsearch.QueryDsl.RangeQuery rangeQuery) => new QueryContainer("range", rangeQuery); - public static QueryContainer RankFeature(Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery rankFeatureQuery) => new QueryContainer("rank_feature", rankFeatureQuery); - public static QueryContainer Regexp(Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery regexpQuery) => new QueryContainer("regexp", regexpQuery); - public static QueryContainer Script(Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery scriptQuery) => new QueryContainer("script", scriptQuery); - public static QueryContainer ScriptScore(Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery scriptScoreQuery) => new QueryContainer("script_score", scriptScoreQuery); - public static QueryContainer SimpleQueryString(Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery simpleQueryStringQuery) => new QueryContainer("simple_query_string", simpleQueryStringQuery); - public static QueryContainer SpanContaining(Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery spanContainingQuery) => new QueryContainer("span_containing", spanContainingQuery); - public static QueryContainer SpanFirst(Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery spanFirstQuery) => new QueryContainer("span_first", spanFirstQuery); - public static QueryContainer SpanMulti(Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery spanMultiTermQuery) => new QueryContainer("span_multi", spanMultiTermQuery); - public static QueryContainer SpanNear(Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery spanNearQuery) => new QueryContainer("span_near", spanNearQuery); - public static QueryContainer SpanNot(Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery spanNotQuery) => new QueryContainer("span_not", spanNotQuery); - public static QueryContainer SpanOr(Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery spanOrQuery) => new QueryContainer("span_or", spanOrQuery); - public static QueryContainer SpanTerm(Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery spanTermQuery) => new QueryContainer("span_term", spanTermQuery); - public static QueryContainer SpanWithin(Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery spanWithinQuery) => new QueryContainer("span_within", spanWithinQuery); - public static QueryContainer Term(Elastic.Clients.Elasticsearch.QueryDsl.TermQuery termQuery) => new QueryContainer("term", termQuery); - public static QueryContainer Terms(Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery termsQuery) => new QueryContainer("terms", termsQuery); - public static QueryContainer TermsSet(Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery termsSetQuery) => new QueryContainer("terms_set", termsSetQuery); - public static QueryContainer Wildcard(Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery wildcardQuery) => new QueryContainer("wildcard", wildcardQuery); - public static QueryContainer Wrapper(Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery wrapperQuery) => new QueryContainer("wrapper", wrapperQuery); -} - -internal sealed class QueryContainerConverter : JsonConverter -{ - public override QueryContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType != JsonTokenType.StartObject) - { - throw new JsonException("Expected start token."); - } - - reader.Read(); - if (reader.TokenType != JsonTokenType.PropertyName) - { - throw new JsonException("Expected a property name token representing the variant held within this container."); - } - - var propertyName = reader.GetString(); - reader.Read(); - if (propertyName == "bool") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "boosting") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "combined_fields") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "constant_score") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "dis_max") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "exists") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "field_masking_span") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "function_score") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "fuzzy") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "has_child") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "has_parent") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "ids") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "intervals") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "match") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "match_all") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "match_bool_prefix") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "match_none") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "match_phrase") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "match_phrase_prefix") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "more_like_this") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "multi_match") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "nested") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "parent_id") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "percolate") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "prefix") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "query_string") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "range") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "rank_feature") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "regexp") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "script") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "script_score") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "simple_query_string") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "span_containing") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "span_first") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "span_multi") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "span_near") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "span_not") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "span_or") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "span_term") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "span_within") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "term") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "terms") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "terms_set") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "wildcard") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - if (propertyName == "wrapper") - { - var variant = JsonSerializer.Deserialize(ref reader, options); - reader.Read(); - return new QueryContainer(propertyName, variant); - } - - throw new JsonException(); - } - - public override void Write(Utf8JsonWriter writer, QueryContainer value, JsonSerializerOptions options) - { - writer.WriteStartObject(); - writer.WritePropertyName(value.VariantName); - switch (value.VariantName) - { - case "bool": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery)value.Variant, options); - break; - case "boosting": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.BoostingQuery)value.Variant, options); - break; - case "combined_fields": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsQuery)value.Variant, options); - break; - case "constant_score": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ConstantScoreQuery)value.Variant, options); - break; - case "dis_max": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.DisMaxQuery)value.Variant, options); - break; - case "exists": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ExistsQuery)value.Variant, options); - break; - case "field_masking_span": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery)value.Variant, options); - break; - case "function_score": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreQuery)value.Variant, options); - break; - case "fuzzy": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.FuzzyQuery)value.Variant, options); - break; - case "has_child": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.HasChildQuery)value.Variant, options); - break; - case "has_parent": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.HasParentQuery)value.Variant, options); - break; - case "ids": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IdsQuery)value.Variant, options); - break; - case "intervals": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.IntervalsQuery)value.Variant, options); - break; - case "match": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchQuery)value.Variant, options); - break; - case "match_all": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchAllQuery)value.Variant, options); - break; - case "match_bool_prefix": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchBoolPrefixQuery)value.Variant, options); - break; - case "match_none": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchNoneQuery)value.Variant, options); - break; - case "match_phrase": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchPhraseQuery)value.Variant, options); - break; - case "match_phrase_prefix": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MatchPhrasePrefixQuery)value.Variant, options); - break; - case "more_like_this": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MoreLikeThisQuery)value.Variant, options); - break; - case "multi_match": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.MultiMatchQuery)value.Variant, options); - break; - case "nested": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.NestedQuery)value.Variant, options); - break; - case "parent_id": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ParentIdQuery)value.Variant, options); - break; - case "percolate": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PercolateQuery)value.Variant, options); - break; - case "prefix": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.PrefixQuery)value.Variant, options); - break; - case "query_string": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.QueryStringQuery)value.Variant, options); - break; - case "range": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RangeQuery)value.Variant, options); - break; - case "rank_feature": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureQuery)value.Variant, options); - break; - case "regexp": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.RegexpQuery)value.Variant, options); - break; - case "script": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptQuery)value.Variant, options); - break; - case "script_score": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreQuery)value.Variant, options); - break; - case "simple_query_string": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringQuery)value.Variant, options); - break; - case "span_containing": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery)value.Variant, options); - break; - case "span_first": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery)value.Variant, options); - break; - case "span_multi": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery)value.Variant, options); - break; - case "span_near": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery)value.Variant, options); - break; - case "span_not": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery)value.Variant, options); - break; - case "span_or": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanOrQuery)value.Variant, options); - break; - case "span_term": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanTermQuery)value.Variant, options); - break; - case "span_within": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanWithinQuery)value.Variant, options); - break; - case "term": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermQuery)value.Variant, options); - break; - case "terms": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsQuery)value.Variant, options); - break; - case "terms_set": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.TermsSetQuery)value.Variant, options); - break; - case "wildcard": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WildcardQuery)value.Variant, options); - break; - case "wrapper": - JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.WrapperQuery)value.Variant, options); - break; - } - - writer.WriteEndObject(); - } -} - -public sealed partial class QueryContainerDescriptor : SerializableDescriptor> -{ - internal QueryContainerDescriptor(Action> configure) => configure.Invoke(this); - public QueryContainerDescriptor() : base() - { - } - - private bool ContainsVariant { get; set; } - - private string ContainedVariantName { get; set; } - - private object Variant { get; set; } - - private Descriptor Descriptor { get; set; } - - private QueryContainerDescriptor Set(Action descriptorAction, string variantName) - where T : Descriptor - { - ContainedVariantName = variantName; - ContainsVariant = true; - var descriptor = (T)Activator.CreateInstance(typeof(T), true); - descriptorAction?.Invoke(descriptor); - Descriptor = descriptor; - return Self; - } - - private QueryContainerDescriptor Set(object variant, string variantName) - { - Variant = variant; - ContainedVariantName = variantName; - ContainsVariant = true; - return Self; - } - - public QueryContainerDescriptor Bool(BoolQuery boolQuery) => Set(boolQuery, "bool"); - public QueryContainerDescriptor Bool(Action> configure) => Set(configure, "bool"); - public QueryContainerDescriptor Boosting(BoostingQuery boostingQuery) => Set(boostingQuery, "boosting"); - public QueryContainerDescriptor Boosting(Action> configure) => Set(configure, "boosting"); - public QueryContainerDescriptor CombinedFields(CombinedFieldsQuery combinedFieldsQuery) => Set(combinedFieldsQuery, "combined_fields"); - public QueryContainerDescriptor CombinedFields(Action> configure) => Set(configure, "combined_fields"); - public QueryContainerDescriptor ConstantScore(ConstantScoreQuery constantScoreQuery) => Set(constantScoreQuery, "constant_score"); - public QueryContainerDescriptor ConstantScore(Action> configure) => Set(configure, "constant_score"); - public QueryContainerDescriptor DisMax(DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max"); - public QueryContainerDescriptor DisMax(Action> configure) => Set(configure, "dis_max"); - public QueryContainerDescriptor Exists(ExistsQuery existsQuery) => Set(existsQuery, "exists"); - public QueryContainerDescriptor Exists(Action> configure) => Set(configure, "exists"); - public QueryContainerDescriptor FieldMaskingSpan(SpanFieldMaskingQuery spanFieldMaskingQuery) => Set(spanFieldMaskingQuery, "field_masking_span"); - public QueryContainerDescriptor FieldMaskingSpan(Action> configure) => Set(configure, "field_masking_span"); - public QueryContainerDescriptor FunctionScore(FunctionScoreQuery functionScoreQuery) => Set(functionScoreQuery, "function_score"); - public QueryContainerDescriptor FunctionScore(Action> configure) => Set(configure, "function_score"); - public QueryContainerDescriptor Fuzzy(FuzzyQuery fuzzyQuery) => Set(fuzzyQuery, "fuzzy"); - public QueryContainerDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public QueryContainerDescriptor HasChild(HasChildQuery hasChildQuery) => Set(hasChildQuery, "has_child"); - public QueryContainerDescriptor HasChild(Action> configure) => Set(configure, "has_child"); - public QueryContainerDescriptor HasParent(HasParentQuery hasParentQuery) => Set(hasParentQuery, "has_parent"); - public QueryContainerDescriptor HasParent(Action> configure) => Set(configure, "has_parent"); - public QueryContainerDescriptor Ids(IdsQuery idsQuery) => Set(idsQuery, "ids"); - public QueryContainerDescriptor Ids(Action configure) => Set(configure, "ids"); - public QueryContainerDescriptor Intervals(IntervalsQuery intervalsQuery) => Set(intervalsQuery, "intervals"); - public QueryContainerDescriptor Intervals(Action> configure) => Set(configure, "intervals"); - public QueryContainerDescriptor Match(MatchQuery matchQuery) => Set(matchQuery, "match"); - public QueryContainerDescriptor Match(Action> configure) => Set(configure, "match"); - public QueryContainerDescriptor MatchAll(MatchAllQuery matchAllQuery) => Set(matchAllQuery, "match_all"); - public QueryContainerDescriptor MatchAll(Action configure) => Set(configure, "match_all"); - public QueryContainerDescriptor MatchBoolPrefix(MatchBoolPrefixQuery matchBoolPrefixQuery) => Set(matchBoolPrefixQuery, "match_bool_prefix"); - public QueryContainerDescriptor MatchBoolPrefix(Action> configure) => Set(configure, "match_bool_prefix"); - public QueryContainerDescriptor MatchNone(MatchNoneQuery matchNoneQuery) => Set(matchNoneQuery, "match_none"); - public QueryContainerDescriptor MatchNone(Action configure) => Set(configure, "match_none"); - public QueryContainerDescriptor MatchPhrase(MatchPhraseQuery matchPhraseQuery) => Set(matchPhraseQuery, "match_phrase"); - public QueryContainerDescriptor MatchPhrase(Action> configure) => Set(configure, "match_phrase"); - public QueryContainerDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => Set(matchPhrasePrefixQuery, "match_phrase_prefix"); - public QueryContainerDescriptor MatchPhrasePrefix(Action> configure) => Set(configure, "match_phrase_prefix"); - public QueryContainerDescriptor MoreLikeThis(MoreLikeThisQuery moreLikeThisQuery) => Set(moreLikeThisQuery, "more_like_this"); - public QueryContainerDescriptor MoreLikeThis(Action> configure) => Set(configure, "more_like_this"); - public QueryContainerDescriptor MultiMatch(MultiMatchQuery multiMatchQuery) => Set(multiMatchQuery, "multi_match"); - public QueryContainerDescriptor MultiMatch(Action> configure) => Set(configure, "multi_match"); - public QueryContainerDescriptor Nested(NestedQuery nestedQuery) => Set(nestedQuery, "nested"); - public QueryContainerDescriptor Nested(Action> configure) => Set(configure, "nested"); - public QueryContainerDescriptor ParentId(ParentIdQuery parentIdQuery) => Set(parentIdQuery, "parent_id"); - public QueryContainerDescriptor ParentId(Action configure) => Set(configure, "parent_id"); - public QueryContainerDescriptor Percolate(PercolateQuery percolateQuery) => Set(percolateQuery, "percolate"); - public QueryContainerDescriptor Percolate(Action> configure) => Set(configure, "percolate"); - public QueryContainerDescriptor Prefix(PrefixQuery prefixQuery) => Set(prefixQuery, "prefix"); - public QueryContainerDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public QueryContainerDescriptor QueryString(QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string"); - public QueryContainerDescriptor QueryString(Action> configure) => Set(configure, "query_string"); - public QueryContainerDescriptor Range(RangeQuery rangeQuery) => Set(rangeQuery, "range"); - public QueryContainerDescriptor RankFeature(RankFeatureQuery rankFeatureQuery) => Set(rankFeatureQuery, "rank_feature"); - public QueryContainerDescriptor RankFeature(Action> configure) => Set(configure, "rank_feature"); - public QueryContainerDescriptor Regexp(RegexpQuery regexpQuery) => Set(regexpQuery, "regexp"); - public QueryContainerDescriptor Regexp(Action> configure) => Set(configure, "regexp"); - public QueryContainerDescriptor Script(ScriptQuery scriptQuery) => Set(scriptQuery, "script"); - public QueryContainerDescriptor Script(Action configure) => Set(configure, "script"); - public QueryContainerDescriptor ScriptScore(ScriptScoreQuery scriptScoreQuery) => Set(scriptScoreQuery, "script_score"); - public QueryContainerDescriptor ScriptScore(Action> configure) => Set(configure, "script_score"); - public QueryContainerDescriptor SimpleQueryString(SimpleQueryStringQuery simpleQueryStringQuery) => Set(simpleQueryStringQuery, "simple_query_string"); - public QueryContainerDescriptor SimpleQueryString(Action> configure) => Set(configure, "simple_query_string"); - public QueryContainerDescriptor SpanContaining(SpanContainingQuery spanContainingQuery) => Set(spanContainingQuery, "span_containing"); - public QueryContainerDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); - public QueryContainerDescriptor SpanFirst(SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); - public QueryContainerDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); - public QueryContainerDescriptor SpanMulti(SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); - public QueryContainerDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); - public QueryContainerDescriptor SpanNear(SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); - public QueryContainerDescriptor SpanNear(Action> configure) => Set(configure, "span_near"); - public QueryContainerDescriptor SpanNot(SpanNotQuery spanNotQuery) => Set(spanNotQuery, "span_not"); - public QueryContainerDescriptor SpanNot(Action> configure) => Set(configure, "span_not"); - public QueryContainerDescriptor SpanOr(SpanOrQuery spanOrQuery) => Set(spanOrQuery, "span_or"); - public QueryContainerDescriptor SpanOr(Action> configure) => Set(configure, "span_or"); - public QueryContainerDescriptor SpanTerm(SpanTermQuery spanTermQuery) => Set(spanTermQuery, "span_term"); - public QueryContainerDescriptor SpanTerm(Action> configure) => Set(configure, "span_term"); - public QueryContainerDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within"); - public QueryContainerDescriptor SpanWithin(Action> configure) => Set(configure, "span_within"); - public QueryContainerDescriptor Term(TermQuery termQuery) => Set(termQuery, "term"); - public QueryContainerDescriptor Term(Action> configure) => Set(configure, "term"); - public QueryContainerDescriptor Terms(TermsQuery termsQuery) => Set(termsQuery, "terms"); - public QueryContainerDescriptor Terms(Action> configure) => Set(configure, "terms"); - public QueryContainerDescriptor TermsSet(TermsSetQuery termsSetQuery) => Set(termsSetQuery, "terms_set"); - public QueryContainerDescriptor TermsSet(Action> configure) => Set(configure, "terms_set"); - public QueryContainerDescriptor Wildcard(WildcardQuery wildcardQuery) => Set(wildcardQuery, "wildcard"); - public QueryContainerDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); - public QueryContainerDescriptor Wrapper(WrapperQuery wrapperQuery) => Set(wrapperQuery, "wrapper"); - public QueryContainerDescriptor Wrapper(Action configure) => Set(configure, "wrapper"); - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (!ContainsVariant) - { - writer.WriteNullValue(); - return; - } - - writer.WriteStartObject(); - writer.WritePropertyName(ContainedVariantName); - if (Variant is not null) - { - JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - writer.WriteEndObject(); - return; - } - - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); - writer.WriteEndObject(); - } -} - -public sealed partial class QueryContainerDescriptor : SerializableDescriptor -{ - internal QueryContainerDescriptor(Action configure) => configure.Invoke(this); - public QueryContainerDescriptor() : base() - { - } - - private bool ContainsVariant { get; set; } - - private string ContainedVariantName { get; set; } - - private object Variant { get; set; } - - private Descriptor Descriptor { get; set; } - - private QueryContainerDescriptor Set(Action descriptorAction, string variantName) - where T : Descriptor - { - ContainedVariantName = variantName; - ContainsVariant = true; - var descriptor = (T)Activator.CreateInstance(typeof(T), true); - descriptorAction?.Invoke(descriptor); - Descriptor = descriptor; - return Self; - } - - private QueryContainerDescriptor Set(object variant, string variantName) - { - Variant = variant; - ContainedVariantName = variantName; - ContainsVariant = true; - return Self; - } - - public QueryContainerDescriptor Bool(BoolQuery boolQuery) => Set(boolQuery, "bool"); - public QueryContainerDescriptor Bool(Action configure) => Set(configure, "bool"); - public QueryContainerDescriptor Bool(Action> configure) => Set(configure, "bool"); - public QueryContainerDescriptor Boosting(BoostingQuery boostingQuery) => Set(boostingQuery, "boosting"); - public QueryContainerDescriptor Boosting(Action configure) => Set(configure, "boosting"); - public QueryContainerDescriptor Boosting(Action> configure) => Set(configure, "boosting"); - public QueryContainerDescriptor CombinedFields(CombinedFieldsQuery combinedFieldsQuery) => Set(combinedFieldsQuery, "combined_fields"); - public QueryContainerDescriptor CombinedFields(Action configure) => Set(configure, "combined_fields"); - public QueryContainerDescriptor CombinedFields(Action> configure) => Set(configure, "combined_fields"); - public QueryContainerDescriptor ConstantScore(ConstantScoreQuery constantScoreQuery) => Set(constantScoreQuery, "constant_score"); - public QueryContainerDescriptor ConstantScore(Action configure) => Set(configure, "constant_score"); - public QueryContainerDescriptor ConstantScore(Action> configure) => Set(configure, "constant_score"); - public QueryContainerDescriptor DisMax(DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max"); - public QueryContainerDescriptor DisMax(Action configure) => Set(configure, "dis_max"); - public QueryContainerDescriptor DisMax(Action> configure) => Set(configure, "dis_max"); - public QueryContainerDescriptor Exists(ExistsQuery existsQuery) => Set(existsQuery, "exists"); - public QueryContainerDescriptor Exists(Action configure) => Set(configure, "exists"); - public QueryContainerDescriptor Exists(Action> configure) => Set(configure, "exists"); - public QueryContainerDescriptor FieldMaskingSpan(SpanFieldMaskingQuery spanFieldMaskingQuery) => Set(spanFieldMaskingQuery, "field_masking_span"); - public QueryContainerDescriptor FieldMaskingSpan(Action configure) => Set(configure, "field_masking_span"); - public QueryContainerDescriptor FieldMaskingSpan(Action> configure) => Set(configure, "field_masking_span"); - public QueryContainerDescriptor FunctionScore(FunctionScoreQuery functionScoreQuery) => Set(functionScoreQuery, "function_score"); - public QueryContainerDescriptor FunctionScore(Action configure) => Set(configure, "function_score"); - public QueryContainerDescriptor FunctionScore(Action> configure) => Set(configure, "function_score"); - public QueryContainerDescriptor Fuzzy(FuzzyQuery fuzzyQuery) => Set(fuzzyQuery, "fuzzy"); - public QueryContainerDescriptor Fuzzy(Action configure) => Set(configure, "fuzzy"); - public QueryContainerDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public QueryContainerDescriptor HasChild(HasChildQuery hasChildQuery) => Set(hasChildQuery, "has_child"); - public QueryContainerDescriptor HasChild(Action configure) => Set(configure, "has_child"); - public QueryContainerDescriptor HasChild(Action> configure) => Set(configure, "has_child"); - public QueryContainerDescriptor HasParent(HasParentQuery hasParentQuery) => Set(hasParentQuery, "has_parent"); - public QueryContainerDescriptor HasParent(Action configure) => Set(configure, "has_parent"); - public QueryContainerDescriptor HasParent(Action> configure) => Set(configure, "has_parent"); - public QueryContainerDescriptor Ids(IdsQuery idsQuery) => Set(idsQuery, "ids"); - public QueryContainerDescriptor Ids(Action configure) => Set(configure, "ids"); - public QueryContainerDescriptor Intervals(IntervalsQuery intervalsQuery) => Set(intervalsQuery, "intervals"); - public QueryContainerDescriptor Intervals(Action configure) => Set(configure, "intervals"); - public QueryContainerDescriptor Intervals(Action> configure) => Set(configure, "intervals"); - public QueryContainerDescriptor Match(MatchQuery matchQuery) => Set(matchQuery, "match"); - public QueryContainerDescriptor Match(Action configure) => Set(configure, "match"); - public QueryContainerDescriptor Match(Action> configure) => Set(configure, "match"); - public QueryContainerDescriptor MatchAll(MatchAllQuery matchAllQuery) => Set(matchAllQuery, "match_all"); - public QueryContainerDescriptor MatchAll(Action configure) => Set(configure, "match_all"); - public QueryContainerDescriptor MatchBoolPrefix(MatchBoolPrefixQuery matchBoolPrefixQuery) => Set(matchBoolPrefixQuery, "match_bool_prefix"); - public QueryContainerDescriptor MatchBoolPrefix(Action configure) => Set(configure, "match_bool_prefix"); - public QueryContainerDescriptor MatchBoolPrefix(Action> configure) => Set(configure, "match_bool_prefix"); - public QueryContainerDescriptor MatchNone(MatchNoneQuery matchNoneQuery) => Set(matchNoneQuery, "match_none"); - public QueryContainerDescriptor MatchNone(Action configure) => Set(configure, "match_none"); - public QueryContainerDescriptor MatchPhrase(MatchPhraseQuery matchPhraseQuery) => Set(matchPhraseQuery, "match_phrase"); - public QueryContainerDescriptor MatchPhrase(Action configure) => Set(configure, "match_phrase"); - public QueryContainerDescriptor MatchPhrase(Action> configure) => Set(configure, "match_phrase"); - public QueryContainerDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => Set(matchPhrasePrefixQuery, "match_phrase_prefix"); - public QueryContainerDescriptor MatchPhrasePrefix(Action configure) => Set(configure, "match_phrase_prefix"); - public QueryContainerDescriptor MatchPhrasePrefix(Action> configure) => Set(configure, "match_phrase_prefix"); - public QueryContainerDescriptor MoreLikeThis(MoreLikeThisQuery moreLikeThisQuery) => Set(moreLikeThisQuery, "more_like_this"); - public QueryContainerDescriptor MoreLikeThis(Action configure) => Set(configure, "more_like_this"); - public QueryContainerDescriptor MoreLikeThis(Action> configure) => Set(configure, "more_like_this"); - public QueryContainerDescriptor MultiMatch(MultiMatchQuery multiMatchQuery) => Set(multiMatchQuery, "multi_match"); - public QueryContainerDescriptor MultiMatch(Action configure) => Set(configure, "multi_match"); - public QueryContainerDescriptor MultiMatch(Action> configure) => Set(configure, "multi_match"); - public QueryContainerDescriptor Nested(NestedQuery nestedQuery) => Set(nestedQuery, "nested"); - public QueryContainerDescriptor Nested(Action configure) => Set(configure, "nested"); - public QueryContainerDescriptor Nested(Action> configure) => Set(configure, "nested"); - public QueryContainerDescriptor ParentId(ParentIdQuery parentIdQuery) => Set(parentIdQuery, "parent_id"); - public QueryContainerDescriptor ParentId(Action configure) => Set(configure, "parent_id"); - public QueryContainerDescriptor Percolate(PercolateQuery percolateQuery) => Set(percolateQuery, "percolate"); - public QueryContainerDescriptor Percolate(Action configure) => Set(configure, "percolate"); - public QueryContainerDescriptor Percolate(Action> configure) => Set(configure, "percolate"); - public QueryContainerDescriptor Prefix(PrefixQuery prefixQuery) => Set(prefixQuery, "prefix"); - public QueryContainerDescriptor Prefix(Action configure) => Set(configure, "prefix"); - public QueryContainerDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public QueryContainerDescriptor QueryString(QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string"); - public QueryContainerDescriptor QueryString(Action configure) => Set(configure, "query_string"); - public QueryContainerDescriptor QueryString(Action> configure) => Set(configure, "query_string"); - public QueryContainerDescriptor Range(RangeQuery rangeQuery) => Set(rangeQuery, "range"); - public QueryContainerDescriptor RankFeature(RankFeatureQuery rankFeatureQuery) => Set(rankFeatureQuery, "rank_feature"); - public QueryContainerDescriptor RankFeature(Action configure) => Set(configure, "rank_feature"); - public QueryContainerDescriptor RankFeature(Action> configure) => Set(configure, "rank_feature"); - public QueryContainerDescriptor Regexp(RegexpQuery regexpQuery) => Set(regexpQuery, "regexp"); - public QueryContainerDescriptor Regexp(Action configure) => Set(configure, "regexp"); - public QueryContainerDescriptor Regexp(Action> configure) => Set(configure, "regexp"); - public QueryContainerDescriptor Script(ScriptQuery scriptQuery) => Set(scriptQuery, "script"); - public QueryContainerDescriptor Script(Action configure) => Set(configure, "script"); - public QueryContainerDescriptor ScriptScore(ScriptScoreQuery scriptScoreQuery) => Set(scriptScoreQuery, "script_score"); - public QueryContainerDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); - public QueryContainerDescriptor ScriptScore(Action> configure) => Set(configure, "script_score"); - public QueryContainerDescriptor SimpleQueryString(SimpleQueryStringQuery simpleQueryStringQuery) => Set(simpleQueryStringQuery, "simple_query_string"); - public QueryContainerDescriptor SimpleQueryString(Action configure) => Set(configure, "simple_query_string"); - public QueryContainerDescriptor SimpleQueryString(Action> configure) => Set(configure, "simple_query_string"); - public QueryContainerDescriptor SpanContaining(SpanContainingQuery spanContainingQuery) => Set(spanContainingQuery, "span_containing"); - public QueryContainerDescriptor SpanContaining(Action configure) => Set(configure, "span_containing"); - public QueryContainerDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); - public QueryContainerDescriptor SpanFirst(SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); - public QueryContainerDescriptor SpanFirst(Action configure) => Set(configure, "span_first"); - public QueryContainerDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); - public QueryContainerDescriptor SpanMulti(SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); - public QueryContainerDescriptor SpanMulti(Action configure) => Set(configure, "span_multi"); - public QueryContainerDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); - public QueryContainerDescriptor SpanNear(SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); - public QueryContainerDescriptor SpanNear(Action configure) => Set(configure, "span_near"); - public QueryContainerDescriptor SpanNear(Action> configure) => Set(configure, "span_near"); - public QueryContainerDescriptor SpanNot(SpanNotQuery spanNotQuery) => Set(spanNotQuery, "span_not"); - public QueryContainerDescriptor SpanNot(Action configure) => Set(configure, "span_not"); - public QueryContainerDescriptor SpanNot(Action> configure) => Set(configure, "span_not"); - public QueryContainerDescriptor SpanOr(SpanOrQuery spanOrQuery) => Set(spanOrQuery, "span_or"); - public QueryContainerDescriptor SpanOr(Action configure) => Set(configure, "span_or"); - public QueryContainerDescriptor SpanOr(Action> configure) => Set(configure, "span_or"); - public QueryContainerDescriptor SpanTerm(SpanTermQuery spanTermQuery) => Set(spanTermQuery, "span_term"); - public QueryContainerDescriptor SpanTerm(Action configure) => Set(configure, "span_term"); - public QueryContainerDescriptor SpanTerm(Action> configure) => Set(configure, "span_term"); - public QueryContainerDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within"); - public QueryContainerDescriptor SpanWithin(Action configure) => Set(configure, "span_within"); - public QueryContainerDescriptor SpanWithin(Action> configure) => Set(configure, "span_within"); - public QueryContainerDescriptor Term(TermQuery termQuery) => Set(termQuery, "term"); - public QueryContainerDescriptor Term(Action configure) => Set(configure, "term"); - public QueryContainerDescriptor Term(Action> configure) => Set(configure, "term"); - public QueryContainerDescriptor Terms(TermsQuery termsQuery) => Set(termsQuery, "terms"); - public QueryContainerDescriptor Terms(Action configure) => Set(configure, "terms"); - public QueryContainerDescriptor Terms(Action> configure) => Set(configure, "terms"); - public QueryContainerDescriptor TermsSet(TermsSetQuery termsSetQuery) => Set(termsSetQuery, "terms_set"); - public QueryContainerDescriptor TermsSet(Action configure) => Set(configure, "terms_set"); - public QueryContainerDescriptor TermsSet(Action> configure) => Set(configure, "terms_set"); - public QueryContainerDescriptor Wildcard(WildcardQuery wildcardQuery) => Set(wildcardQuery, "wildcard"); - public QueryContainerDescriptor Wildcard(Action configure) => Set(configure, "wildcard"); - public QueryContainerDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); - public QueryContainerDescriptor Wrapper(WrapperQuery wrapperQuery) => Set(wrapperQuery, "wrapper"); - public QueryContainerDescriptor Wrapper(Action configure) => Set(configure, "wrapper"); - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) - { - if (!ContainsVariant) - { - writer.WriteNullValue(); - return; - } - - writer.WriteStartObject(); - writer.WritePropertyName(ContainedVariantName); - if (Variant is not null) - { - JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - writer.WriteEndObject(); - return; - } - - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); - writer.WriteEndObject(); - } -} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs index 6f8d9492c78..46190857f36 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class QueryStringQuery : Query +public sealed partial class QueryStringQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -135,7 +135,7 @@ public sealed partial class QueryStringQuery : Query [JsonPropertyName("type")] public Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? Type { get; set; } - public static implicit operator QueryContainer(QueryStringQuery queryStringQuery) => QueryContainer.QueryString(queryStringQuery); + public static implicit operator Query(QueryStringQuery queryStringQuery) => QueryDsl.Query.QueryString(queryStringQuery); } public sealed partial class QueryStringQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RandomScoreFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RandomScoreFunction.g.cs index f3d247ebfcf..044c4af8634 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RandomScoreFunction.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RandomScoreFunction.g.cs @@ -35,7 +35,7 @@ public sealed partial class RandomScoreFunction [JsonPropertyName("seed")] public Union? Seed { get; set; } - public static implicit operator FunctionScoreContainer(RandomScoreFunction randomScoreFunction) => FunctionScoreContainer.RandomScore(randomScoreFunction); + public static implicit operator FunctionScore(RandomScoreFunction randomScoreFunction) => QueryDsl.FunctionScore.RandomScore(randomScoreFunction); } public sealed partial class RandomScoreFunctionDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RangeQuery.g.cs deleted file mode 100644 index ec7e1c9c6ad..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RangeQuery.g.cs +++ /dev/null @@ -1,38 +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. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using Elastic.Transport; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch.QueryDsl; -public partial class RangeQuery : Union -{ - public RangeQuery(Elastic.Clients.Elasticsearch.QueryDsl.DateRangeQuery date) : base(date) - { - } - - public RangeQuery(Elastic.Clients.Elasticsearch.QueryDsl.NumberRangeQuery number) : base(number) - { - } -} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureQuery.g.cs index 7b286949cd5..892d3116331 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class RankFeatureQuery : Query +public sealed partial class RankFeatureQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -55,7 +55,7 @@ public sealed partial class RankFeatureQuery : Query [JsonPropertyName("sigmoid")] public Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionSigmoid? Sigmoid { get; set; } - public static implicit operator QueryContainer(RankFeatureQuery rankFeatureQuery) => QueryContainer.RankFeature(rankFeatureQuery); + public static implicit operator Query(RankFeatureQuery rankFeatureQuery) => QueryDsl.Query.RankFeature(rankFeatureQuery); } public sealed partial class RankFeatureQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs index 18267422836..5dc299d9400 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs @@ -145,7 +145,7 @@ public override void Write(Utf8JsonWriter writer, RegexpQuery value, JsonSeriali } [JsonConverter(typeof(RegexpQueryConverter))] -public sealed partial class RegexpQuery : Query +public sealed partial class RegexpQuery : SearchQuery { public RegexpQuery(Field field) { @@ -170,7 +170,7 @@ public RegexpQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(RegexpQuery regexpQuery) => QueryContainer.Regexp(regexpQuery); + public static implicit operator Query(RegexpQuery regexpQuery) => QueryDsl.Query.Regexp(regexpQuery); } public sealed partial class RegexpQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptQuery.g.cs index c3b2447b6f8..6d2963a75b1 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class ScriptQuery : Query +public sealed partial class ScriptQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -39,7 +39,7 @@ public sealed partial class ScriptQuery : Query [JsonPropertyName("script")] public Elastic.Clients.Elasticsearch.Script Script { get; set; } - public static implicit operator QueryContainer(ScriptQuery scriptQuery) => QueryContainer.Script(scriptQuery); + public static implicit operator Query(ScriptQuery scriptQuery) => QueryDsl.Query.Script(scriptQuery); } public sealed partial class ScriptQueryDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreFunction.g.cs index 5fcdb317d9b..125df8d1e94 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreFunction.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreFunction.g.cs @@ -31,7 +31,7 @@ public sealed partial class ScriptScoreFunction [JsonPropertyName("script")] public Elastic.Clients.Elasticsearch.Script Script { get; set; } - public static implicit operator FunctionScoreContainer(ScriptScoreFunction scriptScoreFunction) => FunctionScoreContainer.ScriptScore(scriptScoreFunction); + public static implicit operator FunctionScore(ScriptScoreFunction scriptScoreFunction) => QueryDsl.FunctionScore.ScriptScore(scriptScoreFunction); } public sealed partial class ScriptScoreFunctionDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreQuery.g.cs index 7477fce1766..7f4443d7980 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class ScriptScoreQuery : Query +public sealed partial class ScriptScoreQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -41,13 +41,13 @@ public sealed partial class ScriptScoreQuery : Query [JsonInclude] [JsonPropertyName("query")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Query { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; } [JsonInclude] [JsonPropertyName("script")] public Elastic.Clients.Elasticsearch.Script Script { get; set; } - public static implicit operator QueryContainer(ScriptScoreQuery scriptScoreQuery) => QueryContainer.ScriptScore(scriptScoreQuery); + public static implicit operator Query(ScriptScoreQuery scriptScoreQuery) => QueryDsl.Query.ScriptScore(scriptScoreQuery); } public sealed partial class ScriptScoreQueryDescriptor : SerializableDescriptor> @@ -57,11 +57,11 @@ public ScriptScoreQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action> QueryDescriptorAction { get; set; } + private Action> QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -71,7 +71,7 @@ public ScriptScoreQueryDescriptor() : base() private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; } - public ScriptScoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public ScriptScoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -79,7 +79,7 @@ public ScriptScoreQueryDescriptor Query(Elastic.Clients.Elasticsearch return Self; } - public ScriptScoreQueryDescriptor Query(QueryContainerDescriptor descriptor) + public ScriptScoreQueryDescriptor Query(QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -87,7 +87,7 @@ public ScriptScoreQueryDescriptor Query(QueryContainerDescriptor Query(Action> configure) + public ScriptScoreQueryDescriptor Query(Action> configure) { QueryValue = null; QueryDescriptor = null; @@ -130,7 +130,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else { @@ -169,11 +169,11 @@ public ScriptScoreQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer QueryValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; } - private QueryContainerDescriptor QueryDescriptor { get; set; } + private QueryDescriptor QueryDescriptor { get; set; } - private Action QueryDescriptorAction { get; set; } + private Action QueryDescriptorAction { get; set; } private string? QueryNameValue { get; set; } @@ -183,7 +183,7 @@ public ScriptScoreQueryDescriptor() : base() private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; } - public ScriptScoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer query) + public ScriptScoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query) { QueryDescriptor = null; QueryDescriptorAction = null; @@ -191,7 +191,7 @@ public ScriptScoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Q return Self; } - public ScriptScoreQueryDescriptor Query(QueryContainerDescriptor descriptor) + public ScriptScoreQueryDescriptor Query(QueryDescriptor descriptor) { QueryValue = null; QueryDescriptorAction = null; @@ -199,7 +199,7 @@ public ScriptScoreQueryDescriptor Query(QueryContainerDescriptor descriptor) return Self; } - public ScriptScoreQueryDescriptor Query(Action configure) + public ScriptScoreQueryDescriptor Query(Action configure) { QueryValue = null; QueryDescriptor = null; @@ -242,7 +242,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (QueryDescriptorAction is not null) { writer.WritePropertyName("query"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(QueryDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(QueryDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringFlags.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringFlags.g.cs deleted file mode 100644 index 3a1b3fec9ca..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringFlags.g.cs +++ /dev/null @@ -1,38 +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. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using Elastic.Transport; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch.QueryDsl; -public partial class SimpleQueryStringFlags : Union -{ - public SimpleQueryStringFlags(Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringFlag single) : base(single) - { - } - - public SimpleQueryStringFlags(string multiple) : base(multiple) - { - } -} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs index 9db45bba9f2..b0e28fce669 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SimpleQueryStringQuery : Query +public sealed partial class SimpleQueryStringQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -55,10 +55,6 @@ public sealed partial class SimpleQueryStringQuery : Query [JsonPropertyName("fields")] public Fields? Fields { get; set; } - [JsonInclude] - [JsonPropertyName("flags")] - public Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringFlags? Flags { get; set; } - [JsonInclude] [JsonPropertyName("fuzzy_max_expansions")] public int? FuzzyMaxExpansions { get; set; } @@ -87,7 +83,7 @@ public sealed partial class SimpleQueryStringQuery : Query [JsonPropertyName("quote_field_suffix")] public string? QuoteFieldSuffix { get; set; } - public static implicit operator QueryContainer(SimpleQueryStringQuery simpleQueryStringQuery) => QueryContainer.SimpleQueryString(simpleQueryStringQuery); + public static implicit operator Query(SimpleQueryStringQuery simpleQueryStringQuery) => QueryDsl.Query.SimpleQueryString(simpleQueryStringQuery); } public sealed partial class SimpleQueryStringQueryDescriptor : SerializableDescriptor> @@ -111,8 +107,6 @@ public SimpleQueryStringQueryDescriptor() : base() private Fields? FieldsValue { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringFlags? FlagsValue { get; set; } - private int? FuzzyMaxExpansionsValue { get; set; } private int? FuzzyPrefixLengthValue { get; set; } @@ -169,12 +163,6 @@ public SimpleQueryStringQueryDescriptor Fields(Fields? fields) return Self; } - public SimpleQueryStringQueryDescriptor Flags(Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringFlags? flags) - { - FlagsValue = flags; - return Self; - } - public SimpleQueryStringQueryDescriptor FuzzyMaxExpansions(int? fuzzyMaxExpansions) { FuzzyMaxExpansionsValue = fuzzyMaxExpansions; @@ -262,12 +250,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, FieldsValue, options); } - if (FlagsValue is not null) - { - writer.WritePropertyName("flags"); - JsonSerializer.Serialize(writer, FlagsValue, options); - } - if (FuzzyMaxExpansionsValue.HasValue) { writer.WritePropertyName("fuzzy_max_expansions"); @@ -331,8 +313,6 @@ public SimpleQueryStringQueryDescriptor() : base() private Fields? FieldsValue { get; set; } - private Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringFlags? FlagsValue { get; set; } - private int? FuzzyMaxExpansionsValue { get; set; } private int? FuzzyPrefixLengthValue { get; set; } @@ -389,12 +369,6 @@ public SimpleQueryStringQueryDescriptor Fields(Fields? fields) return Self; } - public SimpleQueryStringQueryDescriptor Flags(Elastic.Clients.Elasticsearch.QueryDsl.SimpleQueryStringFlags? flags) - { - FlagsValue = flags; - return Self; - } - public SimpleQueryStringQueryDescriptor FuzzyMaxExpansions(int? fuzzyMaxExpansions) { FuzzyMaxExpansionsValue = fuzzyMaxExpansions; @@ -482,12 +456,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, FieldsValue, options); } - if (FlagsValue is not null) - { - writer.WritePropertyName("flags"); - JsonSerializer.Serialize(writer, FlagsValue, options); - } - if (FuzzyMaxExpansionsValue.HasValue) { writer.WritePropertyName("fuzzy_max_expansions"); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanContainingQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanContainingQuery.g.cs index ecd95c8aefa..5cd3dae3467 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanContainingQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanContainingQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SpanContainingQuery : Query +public sealed partial class SpanContainingQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFieldMaskingQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFieldMaskingQuery.g.cs index 4d9c735de8a..36f09a92d06 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFieldMaskingQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFieldMaskingQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SpanFieldMaskingQuery : Query +public sealed partial class SpanFieldMaskingQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFirstQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFirstQuery.g.cs index cc44d9acf5e..ea529e4e248 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFirstQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFirstQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SpanFirstQuery : Query +public sealed partial class SpanFirstQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanMultiTermQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanMultiTermQuery.g.cs index e3258531473..7127bd49d1f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanMultiTermQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanMultiTermQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SpanMultiTermQuery : Query +public sealed partial class SpanMultiTermQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -37,7 +37,7 @@ public sealed partial class SpanMultiTermQuery : Query [JsonInclude] [JsonPropertyName("match")] - public Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer Match { get; set; } + public Elastic.Clients.Elasticsearch.QueryDsl.Query Match { get; set; } } public sealed partial class SpanMultiTermQueryDescriptor : SerializableDescriptor> @@ -47,17 +47,17 @@ public SpanMultiTermQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer MatchValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query MatchValue { get; set; } - private QueryContainerDescriptor MatchDescriptor { get; set; } + private QueryDescriptor MatchDescriptor { get; set; } - private Action> MatchDescriptorAction { get; set; } + private Action> MatchDescriptorAction { get; set; } private string? QueryNameValue { get; set; } private float? BoostValue { get; set; } - public SpanMultiTermQueryDescriptor Match(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer match) + public SpanMultiTermQueryDescriptor Match(Elastic.Clients.Elasticsearch.QueryDsl.Query match) { MatchDescriptor = null; MatchDescriptorAction = null; @@ -65,7 +65,7 @@ public SpanMultiTermQueryDescriptor Match(Elastic.Clients.Elasticsear return Self; } - public SpanMultiTermQueryDescriptor Match(QueryContainerDescriptor descriptor) + public SpanMultiTermQueryDescriptor Match(QueryDescriptor descriptor) { MatchValue = null; MatchDescriptorAction = null; @@ -73,7 +73,7 @@ public SpanMultiTermQueryDescriptor Match(QueryContainerDescriptor Match(Action> configure) + public SpanMultiTermQueryDescriptor Match(Action> configure) { MatchValue = null; MatchDescriptor = null; @@ -104,7 +104,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MatchDescriptorAction is not null) { writer.WritePropertyName("match"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(MatchDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(MatchDescriptorAction), options); } else { @@ -135,17 +135,17 @@ public SpanMultiTermQueryDescriptor() : base() { } - private Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer MatchValue { get; set; } + private Elastic.Clients.Elasticsearch.QueryDsl.Query MatchValue { get; set; } - private QueryContainerDescriptor MatchDescriptor { get; set; } + private QueryDescriptor MatchDescriptor { get; set; } - private Action MatchDescriptorAction { get; set; } + private Action MatchDescriptorAction { get; set; } private string? QueryNameValue { get; set; } private float? BoostValue { get; set; } - public SpanMultiTermQueryDescriptor Match(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer match) + public SpanMultiTermQueryDescriptor Match(Elastic.Clients.Elasticsearch.QueryDsl.Query match) { MatchDescriptor = null; MatchDescriptorAction = null; @@ -153,7 +153,7 @@ public SpanMultiTermQueryDescriptor Match(Elastic.Clients.Elasticsearch.QueryDsl return Self; } - public SpanMultiTermQueryDescriptor Match(QueryContainerDescriptor descriptor) + public SpanMultiTermQueryDescriptor Match(QueryDescriptor descriptor) { MatchValue = null; MatchDescriptorAction = null; @@ -161,7 +161,7 @@ public SpanMultiTermQueryDescriptor Match(QueryContainerDescriptor descriptor) return Self; } - public SpanMultiTermQueryDescriptor Match(Action configure) + public SpanMultiTermQueryDescriptor Match(Action configure) { MatchValue = null; MatchDescriptor = null; @@ -192,7 +192,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MatchDescriptorAction is not null) { writer.WritePropertyName("match"); - JsonSerializer.Serialize(writer, new QueryContainerDescriptor(MatchDescriptorAction), options); + JsonSerializer.Serialize(writer, new QueryDescriptor(MatchDescriptorAction), options); } else { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNearQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNearQuery.g.cs index 700b73ef4f3..be287a2b350 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNearQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNearQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SpanNearQuery : Query +public sealed partial class SpanNearQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNotQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNotQuery.g.cs index 9985c1375fc..8c27780ccc4 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNotQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNotQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SpanNotQuery : Query +public sealed partial class SpanNotQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanOrQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanOrQuery.g.cs index 5b0577e2b75..af337eaa084 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanOrQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanOrQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SpanOrQuery : Query +public sealed partial class SpanOrQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs index 1b7c33a261d..a13c4fb4a60 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs @@ -26,7 +26,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; [JsonConverter(typeof(SpanQueryConverter))] -public sealed partial class SpanQuery : Query +public sealed partial class SpanQuery : SearchQuery { internal SpanQuery(string variantName, object variant) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs index 0895f2160c6..7b6132a7c5a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs @@ -97,7 +97,7 @@ public override void Write(Utf8JsonWriter writer, SpanTermQuery value, JsonSeria } [JsonConverter(typeof(SpanTermQueryConverter))] -public sealed partial class SpanTermQuery : Query +public sealed partial class SpanTermQuery : SearchQuery { public SpanTermQuery(Field field) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanWithinQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanWithinQuery.g.cs index dd894a89c4c..bd0eeca1653 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanWithinQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanWithinQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class SpanWithinQuery : Query +public sealed partial class SpanWithinQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs index fc30efcd69d..a0236ce2470 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs @@ -109,7 +109,7 @@ public override void Write(Utf8JsonWriter writer, TermQuery value, JsonSerialize } [JsonConverter(typeof(TermQueryConverter))] -public sealed partial class TermQuery : Query +public sealed partial class TermQuery : SearchQuery { public TermQuery(Field field) { @@ -128,7 +128,7 @@ public TermQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(TermQuery termQuery) => QueryContainer.Term(termQuery); + public static implicit operator Query(TermQuery termQuery) => QueryDsl.Query.Term(termQuery); } public sealed partial class TermQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs index 5fc7d068f37..f7375e82676 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs @@ -90,7 +90,7 @@ public override void Write(Utf8JsonWriter writer, TermsQuery value, JsonSerializ } [JsonConverter(typeof(TermsQueryConverter))] -public sealed partial class TermsQuery : Query +public sealed partial class TermsQuery : SearchQuery { public string? QueryName { get; set; } @@ -100,7 +100,7 @@ public sealed partial class TermsQuery : Query public Elastic.Clients.Elasticsearch.QueryDsl.TermsQueryField Terms { get; set; } - public static implicit operator QueryContainer(TermsQuery termsQuery) => QueryContainer.Terms(termsQuery); + public static implicit operator Query(TermsQuery termsQuery) => QueryDsl.Query.Terms(termsQuery); } public sealed partial class TermsQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs index c096a82669a..db0c9943c13 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs @@ -121,7 +121,7 @@ public override void Write(Utf8JsonWriter writer, TermsSetQuery value, JsonSeria } [JsonConverter(typeof(TermsSetQueryConverter))] -public sealed partial class TermsSetQuery : Query +public sealed partial class TermsSetQuery : SearchQuery { public TermsSetQuery(Field field) { @@ -142,7 +142,7 @@ public TermsSetQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(TermsSetQuery termsSetQuery) => QueryContainer.TermsSet(termsSetQuery); + public static implicit operator Query(TermsSetQuery termsSetQuery) => QueryDsl.Query.TermsSet(termsSetQuery); } public sealed partial class TermsSetQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs index 1ed7cfc9a98..b1f137890ff 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs @@ -137,7 +137,7 @@ public override void Write(Utf8JsonWriter writer, WildcardQuery value, JsonSeria } [JsonConverter(typeof(WildcardQueryConverter))] -public sealed partial class WildcardQuery : Query +public sealed partial class WildcardQuery : SearchQuery { public WildcardQuery(Field field) { @@ -160,7 +160,7 @@ public WildcardQuery(Field field) public Elastic.Clients.Elasticsearch.Field Field { get; set; } - public static implicit operator QueryContainer(WildcardQuery wildcardQuery) => QueryContainer.Wildcard(wildcardQuery); + public static implicit operator Query(WildcardQuery wildcardQuery) => QueryDsl.Query.Wildcard(wildcardQuery); } public sealed partial class WildcardQueryDescriptor : SerializableDescriptor> diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WrapperQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WrapperQuery.g.cs index 72d41e674d3..fd7363538cb 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WrapperQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WrapperQuery.g.cs @@ -25,7 +25,7 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.QueryDsl; -public sealed partial class WrapperQuery : Query +public sealed partial class WrapperQuery : SearchQuery { [JsonInclude] [JsonPropertyName("_name")] @@ -39,7 +39,7 @@ public sealed partial class WrapperQuery : Query [JsonPropertyName("query")] public string Query { get; set; } - public static implicit operator QueryContainer(WrapperQuery wrapperQuery) => QueryContainer.Wrapper(wrapperQuery); + public static implicit operator Query(WrapperQuery wrapperQuery) => QueryDsl.Query.Wrapper(wrapperQuery); } public sealed partial class WrapperQueryDescriptor : SerializableDescriptor diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs similarity index 55% rename from src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs rename to src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs index b2f7e13536b..851a5117b90 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs @@ -25,10 +25,10 @@ #nullable restore namespace Elastic.Clients.Elasticsearch.TransformManagement; -[JsonConverter(typeof(PivotGroupByContainerConverter))] -public sealed partial class PivotGroupByContainer +[JsonConverter(typeof(PivotGroupByConverter))] +public sealed partial class PivotGroupBy { - internal PivotGroupByContainer(string variantName, object variant) + internal PivotGroupBy(string variantName, object variant) { if (variantName is null) throw new ArgumentNullException(nameof(variantName)); @@ -44,14 +44,14 @@ internal PivotGroupByContainer(string variantName, object variant) internal string VariantName { get; } - public static PivotGroupByContainer DateHistogram(Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation dateHistogramAggregation) => new PivotGroupByContainer("date_histogram", dateHistogramAggregation); - public static PivotGroupByContainer Histogram(Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation histogramAggregation) => new PivotGroupByContainer("histogram", histogramAggregation); - public static PivotGroupByContainer Terms(Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation termsAggregation) => new PivotGroupByContainer("terms", termsAggregation); + public static PivotGroupBy DateHistogram(Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation dateHistogramAggregation) => new PivotGroupBy("date_histogram", dateHistogramAggregation); + public static PivotGroupBy Histogram(Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation histogramAggregation) => new PivotGroupBy("histogram", histogramAggregation); + public static PivotGroupBy Terms(Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation termsAggregation) => new PivotGroupBy("terms", termsAggregation); } -internal sealed class PivotGroupByContainerConverter : JsonConverter +internal sealed class PivotGroupByConverter : JsonConverter { - public override PivotGroupByContainer Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + public override PivotGroupBy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { if (reader.TokenType != JsonTokenType.StartObject) { @@ -70,27 +70,27 @@ public override PivotGroupByContainer Read(ref Utf8JsonReader reader, Type typeT { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new PivotGroupByContainer(propertyName, variant); + return new PivotGroupBy(propertyName, variant); } if (propertyName == "histogram") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new PivotGroupByContainer(propertyName, variant); + return new PivotGroupBy(propertyName, variant); } if (propertyName == "terms") { var variant = JsonSerializer.Deserialize(ref reader, options); reader.Read(); - return new PivotGroupByContainer(propertyName, variant); + return new PivotGroupBy(propertyName, variant); } throw new JsonException(); } - public override void Write(Utf8JsonWriter writer, PivotGroupByContainer value, JsonSerializerOptions options) + public override void Write(Utf8JsonWriter writer, PivotGroupBy value, JsonSerializerOptions options) { writer.WriteStartObject(); writer.WritePropertyName(value.VariantName); @@ -111,10 +111,10 @@ public override void Write(Utf8JsonWriter writer, PivotGroupByContainer value, J } } -public sealed partial class PivotGroupByContainerDescriptor : SerializableDescriptor> +public sealed partial class PivotGroupByDescriptor : SerializableDescriptor> { - internal PivotGroupByContainerDescriptor(Action> configure) => configure.Invoke(this); - public PivotGroupByContainerDescriptor() : base() + internal PivotGroupByDescriptor(Action> configure) => configure.Invoke(this); + public PivotGroupByDescriptor() : base() { } @@ -126,7 +126,7 @@ public PivotGroupByContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private PivotGroupByContainerDescriptor Set(Action descriptorAction, string variantName) + private PivotGroupByDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -137,7 +137,7 @@ private PivotGroupByContainerDescriptor Set(Action descriptorAc return Self; } - private PivotGroupByContainerDescriptor Set(object variant, string variantName) + private PivotGroupByDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -145,12 +145,12 @@ private PivotGroupByContainerDescriptor Set(object variant, string va return Self; } - public PivotGroupByContainerDescriptor DateHistogram(Aggregations.DateHistogramAggregation dateHistogramAggregation) => Set(dateHistogramAggregation, "date_histogram"); - public PivotGroupByContainerDescriptor DateHistogram(Action> configure) => Set(configure, "date_histogram"); - public PivotGroupByContainerDescriptor Histogram(Aggregations.HistogramAggregation histogramAggregation) => Set(histogramAggregation, "histogram"); - public PivotGroupByContainerDescriptor Histogram(Action> configure) => Set(configure, "histogram"); - public PivotGroupByContainerDescriptor Terms(Aggregations.TermsAggregation termsAggregation) => Set(termsAggregation, "terms"); - public PivotGroupByContainerDescriptor Terms(Action> configure) => Set(configure, "terms"); + public PivotGroupByDescriptor DateHistogram(Aggregations.DateHistogramAggregation dateHistogramAggregation) => Set(dateHistogramAggregation, "date_histogram"); + public PivotGroupByDescriptor DateHistogram(Action> configure) => Set(configure, "date_histogram"); + public PivotGroupByDescriptor Histogram(Aggregations.HistogramAggregation histogramAggregation) => Set(histogramAggregation, "histogram"); + public PivotGroupByDescriptor Histogram(Action> configure) => Set(configure, "histogram"); + public PivotGroupByDescriptor Terms(Aggregations.TermsAggregation termsAggregation) => Set(termsAggregation, "terms"); + public PivotGroupByDescriptor Terms(Action> configure) => Set(configure, "terms"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -173,10 +173,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o } } -public sealed partial class PivotGroupByContainerDescriptor : SerializableDescriptor +public sealed partial class PivotGroupByDescriptor : SerializableDescriptor { - internal PivotGroupByContainerDescriptor(Action configure) => configure.Invoke(this); - public PivotGroupByContainerDescriptor() : base() + internal PivotGroupByDescriptor(Action configure) => configure.Invoke(this); + public PivotGroupByDescriptor() : base() { } @@ -188,7 +188,7 @@ public PivotGroupByContainerDescriptor() : base() private Descriptor Descriptor { get; set; } - private PivotGroupByContainerDescriptor Set(Action descriptorAction, string variantName) + private PivotGroupByDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { ContainedVariantName = variantName; @@ -199,7 +199,7 @@ private PivotGroupByContainerDescriptor Set(Action descriptorAction, strin return Self; } - private PivotGroupByContainerDescriptor Set(object variant, string variantName) + private PivotGroupByDescriptor Set(object variant, string variantName) { Variant = variant; ContainedVariantName = variantName; @@ -207,15 +207,15 @@ private PivotGroupByContainerDescriptor Set(object variant, string variantName) return Self; } - public PivotGroupByContainerDescriptor DateHistogram(Aggregations.DateHistogramAggregation dateHistogramAggregation) => Set(dateHistogramAggregation, "date_histogram"); - public PivotGroupByContainerDescriptor DateHistogram(Action configure) => Set(configure, "date_histogram"); - public PivotGroupByContainerDescriptor DateHistogram(Action> configure) => Set(configure, "date_histogram"); - public PivotGroupByContainerDescriptor Histogram(Aggregations.HistogramAggregation histogramAggregation) => Set(histogramAggregation, "histogram"); - public PivotGroupByContainerDescriptor Histogram(Action configure) => Set(configure, "histogram"); - public PivotGroupByContainerDescriptor Histogram(Action> configure) => Set(configure, "histogram"); - public PivotGroupByContainerDescriptor Terms(Aggregations.TermsAggregation termsAggregation) => Set(termsAggregation, "terms"); - public PivotGroupByContainerDescriptor Terms(Action configure) => Set(configure, "terms"); - public PivotGroupByContainerDescriptor Terms(Action> configure) => Set(configure, "terms"); + public PivotGroupByDescriptor DateHistogram(Aggregations.DateHistogramAggregation dateHistogramAggregation) => Set(dateHistogramAggregation, "date_histogram"); + public PivotGroupByDescriptor DateHistogram(Action configure) => Set(configure, "date_histogram"); + public PivotGroupByDescriptor DateHistogram(Action> configure) => Set(configure, "date_histogram"); + public PivotGroupByDescriptor Histogram(Aggregations.HistogramAggregation histogramAggregation) => Set(histogramAggregation, "histogram"); + public PivotGroupByDescriptor Histogram(Action configure) => Set(configure, "histogram"); + public PivotGroupByDescriptor Histogram(Action> configure) => Set(configure, "histogram"); + public PivotGroupByDescriptor Terms(Aggregations.TermsAggregation termsAggregation) => Set(termsAggregation, "terms"); + public PivotGroupByDescriptor Terms(Action configure) => Set(configure, "terms"); + public PivotGroupByDescriptor Terms(Action> configure) => Set(configure, "terms"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) diff --git a/src/Playground/Program.cs b/src/Playground/Program.cs index fb8242e58e1..b7aa873b210 100644 --- a/src/Playground/Program.cs +++ b/src/Playground/Program.cs @@ -8,7 +8,7 @@ using Elastic.Transport; using Moq; using Playground; -using CreateIndexResponse = Elastic.Clients.Elasticsearch.IndexManagement.CreateResponse; +using CreateIndexResponse = Elastic.Clients.Elasticsearch.IndexManagement.CreateIndexResponse; // const string IndexName = "stock-demo-v1"; @@ -31,7 +31,7 @@ Console.ReadKey(); #region Hidden -AggregationContainer a = new TermsAggregation("test"); +Aggregation a = new TermsAggregation("test"); var settings = new ElasticsearchClientSettings(new InMemoryConnection()) .DefaultIndex("default-index") @@ -124,7 +124,7 @@ // .Size(0) // .Query(q => q // .Bool(b => b -// .Filter(new[] { new QueryContainer(new TermQuery { Field = "symbol", Value = "MSFT" }) }))) +// .Filter(new[] { new Query(new TermQuery { Field = "symbol", Value = "MSFT" }) }))) // .Aggregations(a => a // .DateHistogram("by-month", dh => dh // .CalendarInterval(CalendarInterval.Month) diff --git a/src/PlaygroundV7x/Program.cs b/src/PlaygroundV7x/Program.cs index 78e812b6bfe..2ea53097e7b 100644 --- a/src/PlaygroundV7x/Program.cs +++ b/src/PlaygroundV7x/Program.cs @@ -83,9 +83,9 @@ static void HandleStatusCode(int? statusCode) // { // From = 10, // Size = 20, -// Query = new QueryContainer(new MatchAllQuery()), +// Query = new Query(new MatchAllQuery()), // Aggregations = aggs, -// PostFilter = new QueryContainer(new TermQuery +// PostFilter = new Query(new TermQuery // { // Field = "state", // Value = "Stable" @@ -174,17 +174,17 @@ static void HandleStatusCode(int? statusCode) // thing = Query.Bool(TestBoolQuery); // var matchQueryOne = Query.Match(m => m.Field(f => f.FirstName).Query("Steve")); -// var matchQueryTwo = new QueryContainer(new MatchQuery() { Field = Infer.Field(f => f.FirstName), Query = "Steve" }); -// var matchQueryThree = new QueryContainerDescriptor().Match(m => m.Field(f => f.FirstName).Query("Steve")); +// var matchQueryTwo = new Query(new MatchQuery() { Field = Infer.Field(f => f.FirstName), Query = "Steve" }); +// var matchQueryThree = new QueryDescriptor().Match(m => m.Field(f => f.FirstName).Query("Steve")); // //var a = client.IndexMany(new Person[0] { }, a => a.) -// var matchAll = new QueryContainer(new MatchAllQuery() { Name = "test_query", IsVerbatim = true }); +// var matchAll = new Query(new MatchAllQuery() { Name = "test_query", IsVerbatim = true }); // //var filter = Query.Bool(b => b.Filter(f => f.Match(m => m.Field(fld => fld.FirstName).Query("Steve").Name("test_match")))); -// var boolQuery = new QueryContainer(new BoolQuery() { Filter = new[] { new QueryContainer(new MatchQuery() { Name = "test_match", Field = "firstName", Query = "Steve" }) } }); +// var boolQuery = new Query(new BoolQuery() { Filter = new[] { new Query(new MatchQuery() { Name = "test_match", Field = "firstName", Query = "Steve" }) } }); -// var spanQuery = new QueryContainer(new SpanContainingQuery() +// var spanQuery = new Query(new SpanContainingQuery() // { // Big = new SpanQuery() // { @@ -202,7 +202,7 @@ static void HandleStatusCode(int? statusCode) // } // }); -// spanQuery = new QueryContainer(new SpanNearQuery() +// spanQuery = new Query(new SpanNearQuery() // { // Clauses = new[] { new SpanQuery() { SpanGap = new SpanGapQuery() { Field = "test", Width = 10 } } } // }); diff --git a/tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs b/tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs index 7a887ab5adf..1834c51b9df 100644 --- a/tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs +++ b/tests/Tests.Core/ManagedElasticsearch/Clusters/ClientTestClusterBase.cs @@ -34,9 +34,9 @@ protected ClientTestClusterBase(ClientTestClusterConfiguration configuration) : protected sealed override void SeedCluster() { - Client.Cluster.Health(new ClusterHealthRequest { WaitForStatus = HealthStatus.Green }); + Client.Cluster.Health(new HealthRequest { WaitForStatus = HealthStatus.Green }); SeedNode(); - Client.Cluster.Health(new ClusterHealthRequest { WaitForStatus = HealthStatus.Green }); + Client.Cluster.Health(new HealthRequest { WaitForStatus = HealthStatus.Green }); } protected virtual void SeedNode() { } diff --git a/tests/Tests.Domain/ProjectPercolation.cs b/tests/Tests.Domain/ProjectPercolation.cs index 36195044305..c2bc6222107 100644 --- a/tests/Tests.Domain/ProjectPercolation.cs +++ b/tests/Tests.Domain/ProjectPercolation.cs @@ -9,5 +9,5 @@ namespace Tests.Domain; public class ProjectPercolation : Project { public string Id { get; set; } - public QueryContainer Query { get; set; } + public Query Query { get; set; } } diff --git a/tests/Tests/Aggregations/AggregationMetaUsageTests.cs b/tests/Tests/Aggregations/AggregationMetaUsageTests.cs index 89cacea06c1..8d46ec1a90b 100644 --- a/tests/Tests/Aggregations/AggregationMetaUsageTests.cs +++ b/tests/Tests/Aggregations/AggregationMetaUsageTests.cs @@ -36,7 +36,7 @@ public AggregationMetaUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base( } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Min("min_last_activity", m => m .Field(p => p.LastActivity) .Meta(d => d diff --git a/tests/Tests/Aggregations/AggregationUsageTestBase.cs b/tests/Tests/Aggregations/AggregationUsageTestBase.cs index 522cdd21b47..b68e12afe8c 100644 --- a/tests/Tests/Aggregations/AggregationUsageTestBase.cs +++ b/tests/Tests/Aggregations/AggregationUsageTestBase.cs @@ -37,7 +37,7 @@ protected AggregationUsageTestBase(TCluster cluster, EndpointUsage usage) : base .Query(QueryScope) .Aggregations(FluentAggs); - protected abstract Action> FluentAggs { get; } + protected abstract Action> FluentAggs { get; } protected override HttpMethod HttpMethod => HttpMethod.POST; @@ -51,7 +51,7 @@ protected AggregationUsageTestBase(TCluster cluster, EndpointUsage usage) : base protected abstract AggregationDictionary InitializerAggs { get; } - protected virtual QueryContainer QueryScope { get; } = new TermQuery("type") { Value = Project.TypeName }; + protected virtual Query QueryScope { get; } = new TermQuery("type") { Value = Project.TypeName }; protected virtual object QueryScopeJson { get; } = new { term = new { type = new { value = Project.TypeName } } }; diff --git a/tests/Tests/Aggregations/Bucket/DateHistogramAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/DateHistogramAggregationUsageTests.cs index 4615120ef22..a3601069540 100644 --- a/tests/Tests/Aggregations/Bucket/DateHistogramAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Bucket/DateHistogramAggregationUsageTests.cs @@ -55,7 +55,7 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .DateHistogram("projects_started_per_month", date => date .Field(p => p.StartedOn) .CalendarInterval(CalendarInterval.Month) diff --git a/tests/Tests/Aggregations/Bucket/TermsAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/TermsAggregationUsageTests.cs index a92fe8ba501..0b0d8c0f7f8 100644 --- a/tests/Tests/Aggregations/Bucket/TermsAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Bucket/TermsAggregationUsageTests.cs @@ -48,7 +48,7 @@ public TermsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Terms("states", st => st .Field(p => p.State) .MinDocCount(2) diff --git a/tests/Tests/Aggregations/Metric/AverageAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/AverageAggregationUsageTests.cs index 60f340908ce..a860a071395 100644 --- a/tests/Tests/Aggregations/Metric/AverageAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/AverageAggregationUsageTests.cs @@ -37,7 +37,7 @@ public AverageAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Avg("average_commits", avg => avg .Meta(m => m .Add("foo", "bar") diff --git a/tests/Tests/Aggregations/Metric/BoxplotAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/BoxplotAggregationUsageTests.cs index 7b851043430..adc1894f16f 100644 --- a/tests/Tests/Aggregations/Metric/BoxplotAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/BoxplotAggregationUsageTests.cs @@ -34,7 +34,7 @@ public BoxplotAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : ba } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Boxplot("boxplot_commits", plot => plot .Meta(m => m .Add("foo", "bar") diff --git a/tests/Tests/Aggregations/Metric/CardinalityAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/CardinalityAggregationUsageTests.cs index a637c6a7c62..ae9852552c8 100644 --- a/tests/Tests/Aggregations/Metric/CardinalityAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/CardinalityAggregationUsageTests.cs @@ -28,7 +28,7 @@ public CardinalityAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Cardinality("state_count", c => c .Field(p => p.State) .PrecisionThreshold(100) diff --git a/tests/Tests/Aggregations/Metric/ExtendedStatsAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/ExtendedStatsAggregationUsageTests.cs index cc168694ca9..7567ab6f55e 100644 --- a/tests/Tests/Aggregations/Metric/ExtendedStatsAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/ExtendedStatsAggregationUsageTests.cs @@ -29,7 +29,7 @@ public ExtendedStatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .ExtendedStats("commit_stats", es => es .Field(p => p.NumberOfCommits) .Sigma(1) @@ -68,13 +68,13 @@ protected override void ExpectResponse(SearchResponse response) } } -// TODO - Handle && operator on QueryContainer +// TODO - Handle && operator on Query //public class ExtendedStatsAggregationUsageDocCountZeroTests */: AggregationUsageTestBase //{ // public ExtendedStatsAggregationUsageDocCountZeroTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { } // // a query that no docs will match -// protected override QueryContainer QueryScope => base.QueryScope && +// protected override Query QueryScope => base.QueryScope && // new TermQuery { Field = Field(f => f.Branches), Value = "non-existent branch name" }; // protected override object QueryScopeJson { get; } = new @@ -102,7 +102,7 @@ protected override void ExpectResponse(SearchResponse response) // } // }; -// protected override Action> FluentAggs => a => a +// protected override Action> FluentAggs => a => a // .ExtendedStats("commit_stats", es => es // .Field(p => p.NumberOfCommits) // .Sigma(1) diff --git a/tests/Tests/Aggregations/Metric/MaxAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/MaxAggregationUsageTests.cs index 3ab6f39757f..3ce2d79cb15 100644 --- a/tests/Tests/Aggregations/Metric/MaxAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/MaxAggregationUsageTests.cs @@ -28,7 +28,7 @@ public MaxAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Max("max_commits", m => m .Field(p => p.NumberOfCommits) ); diff --git a/tests/Tests/Aggregations/Metric/MedianAbsoluteDeviationAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/MedianAbsoluteDeviationAggregationUsageTests.cs index ecc6882e5d6..a87b12def90 100644 --- a/tests/Tests/Aggregations/Metric/MedianAbsoluteDeviationAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/MedianAbsoluteDeviationAggregationUsageTests.cs @@ -33,7 +33,7 @@ public MedianAbsoluteDeviationAggregationUsageTests(ReadOnlyCluster i, EndpointU } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Avg("average_commits", avg => avg .Field(p => p.NumberOfCommits) ) diff --git a/tests/Tests/Aggregations/Metric/MinAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/MinAggregationUsageTests.cs index 8631b0d1160..b14ed54563c 100644 --- a/tests/Tests/Aggregations/Metric/MinAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/MinAggregationUsageTests.cs @@ -28,7 +28,7 @@ public MinAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Min("min_last_activity", m => m .Field(p => p.LastActivity) .Format("yyyy") diff --git a/tests/Tests/Aggregations/Metric/StatsAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/StatsAggregationUsageTests.cs index 3b34f187086..893d303ba16 100644 --- a/tests/Tests/Aggregations/Metric/StatsAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/StatsAggregationUsageTests.cs @@ -27,7 +27,7 @@ public StatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Stats("commit_stats", st => st .Field(p => p.NumberOfCommits) ); diff --git a/tests/Tests/Aggregations/Metric/StringStatsAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/StringStatsAggregationUsageTests.cs index 6474a02d1fb..c9d868930b0 100644 --- a/tests/Tests/Aggregations/Metric/StringStatsAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/StringStatsAggregationUsageTests.cs @@ -27,7 +27,7 @@ public StringStatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .StringStats("name_stats", st => st .Field(p => p.Name) ); diff --git a/tests/Tests/Aggregations/Metric/StringStatsWithDistributionAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/StringStatsWithDistributionAggregationUsageTests.cs index e01d34b2228..52200dcdad3 100644 --- a/tests/Tests/Aggregations/Metric/StringStatsWithDistributionAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/StringStatsWithDistributionAggregationUsageTests.cs @@ -28,7 +28,7 @@ public StringStatsWithDistributionAggregationUsageTests(ReadOnlyCluster i, Endpo } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .StringStats("name_stats", st => st .Field(p => p.Name) .ShowDistribution() diff --git a/tests/Tests/Aggregations/Metric/SumAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/SumAggregationUsageTests.cs index 983e89402e9..9813888e4d1 100644 --- a/tests/Tests/Aggregations/Metric/SumAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/SumAggregationUsageTests.cs @@ -28,7 +28,7 @@ public SumAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .Sum("commits_sum", sm => sm .Field(p => p.NumberOfCommits) ); diff --git a/tests/Tests/Aggregations/Metric/ValueCountAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/ValueCountAggregationUsageTests.cs index cd889ca563a..0fbeed6a2a0 100644 --- a/tests/Tests/Aggregations/Metric/ValueCountAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/ValueCountAggregationUsageTests.cs @@ -28,7 +28,7 @@ public ValueCountAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .ValueCount("commit_count", c => c .Field(p => p.NumberOfCommits) ); diff --git a/tests/Tests/Aggregations/Metric/WeightedAverageAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/WeightedAverageAggregationUsageTests.cs index 799bca8f952..94cd1e73847 100644 --- a/tests/Tests/Aggregations/Metric/WeightedAverageAggregationUsageTests.cs +++ b/tests/Tests/Aggregations/Metric/WeightedAverageAggregationUsageTests.cs @@ -40,7 +40,7 @@ public WeightedAverageAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usa } }; - protected override Action> FluentAggs => a => a + protected override Action> FluentAggs => a => a .WeightedAvg("weighted_avg_commits", avg => avg .Value(v => v.Field(p => p.NumberOfCommits).Missing(0)) //.Weight(w => w.Script("(doc['numberOfContributors']?.value ?: 0) + 1")) diff --git a/tests/Tests/AsyncSearch/AsyncSearchApiCoordinatedTests.cs b/tests/Tests/AsyncSearch/AsyncSearchApiCoordinatedTests.cs index 178d88f7830..0091a88ac0e 100644 --- a/tests/Tests/AsyncSearch/AsyncSearchApiCoordinatedTests.cs +++ b/tests/Tests/AsyncSearch/AsyncSearchApiCoordinatedTests.cs @@ -28,8 +28,8 @@ public AsyncSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usa { { SubmitStep, u => - u.Calls, AsyncSearchSubmitRequest, AsyncSearchSubmitResponse>( - v => new AsyncSearchSubmitRequest + u.Calls, SubmitAsyncSearchRequest, SubmitAsyncSearchResponse>( + v => new SubmitAsyncSearchRequest { Query = new MatchAllQuery(), KeepOnCompletion = true, @@ -123,7 +123,7 @@ public AsyncSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usa { } [I] - public async Task AsyncSearchSubmitResponse() => await Assert>(SubmitStep, r => + public async Task SubmitAsyncSearchResponse() => await Assert>(SubmitStep, r => { r.ShouldBeValid(); r.Id.Should().NotBeNullOrEmpty(); diff --git a/tests/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs b/tests/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs index 8f50c4685e1..c71b7b84d91 100644 --- a/tests/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs +++ b/tests/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs @@ -195,7 +195,7 @@ // * and supports a number of special types defined in NEST // * // * [horizontal] -// * `Nest.QueryContainer`:: maps to `"percolator"` +// * `Nest.Query`:: maps to `"percolator"` // * `Nest.GeoLocation`:: maps to `"geo_point"` // * `Nest.IGeoShape`:: maps to `"geo_shape"` (if you want to map to a `"shape"` type use explicit mapping or the [Shape] attribute on the property) // * `Nest.CompletionField`:: maps to `"completion"` diff --git a/tests/Tests/ClientConcepts/HighLevel/Serialization/CustomSerialization.doc.cs b/tests/Tests/ClientConcepts/HighLevel/Serialization/CustomSerialization.doc.cs index f1cd2bbfa41..bd0fe2d115a 100644 --- a/tests/Tests/ClientConcepts/HighLevel/Serialization/CustomSerialization.doc.cs +++ b/tests/Tests/ClientConcepts/HighLevel/Serialization/CustomSerialization.doc.cs @@ -102,12 +102,12 @@ public void TheNewContract() */ public class MyPercolationDocument { - public QueryContainer Query { get; set; } + public Query Query { get; set; } public string Category { get; set; } } /** - * A custom serializer would not know how to serialize `QueryContainer` or other NEST types that could appear as part of + * A custom serializer would not know how to serialize `Query` or other NEST types that could appear as part of * the `_source` of a document, therefore a custom serializer needs to have a way to delegate serialization of NEST types * back to NEST's built-in serializer. */ @@ -188,7 +188,7 @@ protected override void ModifyContractResolver(ConnectionSettingsAwareContractRe * * without affecting how NEST's own types are serialized. Furthermore, because this serializer is aware of * the built-in serializer, we can automatically inject a `JsonConverter` to handle - * known NEST types that could appear as part of the source, such as the aformentioned `QueryContainer`. + * known NEST types that could appear as part of the source, such as the aformentioned `Query`. * * Let's demonstrate with an example document type */ diff --git a/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs b/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs index 75c7fc3d7d1..fe262542d5d 100644 --- a/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs +++ b/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs @@ -11,7 +11,7 @@ namespace Tests.Cluster.ClusterHealth; public class ClusterHealthApiTests - : ApiIntegrationTestBase + : ApiIntegrationTestBase { public ClusterHealthApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } @@ -27,7 +27,7 @@ protected override LazyResponses ClientUsage() => Calls( (client, r) => client.Cluster.HealthAsync(r) ); - protected override void ExpectResponse(ClusterHealthResponse response) + protected override void ExpectResponse(HealthResponse response) { response.ClusterName.Should().NotBeNullOrWhiteSpace(); response.Status.Should().NotBe(HealthStatus.Red); diff --git a/tests/Tests/Cluster/ClusterHealth/ClusterHealthResponseDeserialisationTests.cs b/tests/Tests/Cluster/ClusterHealth/ClusterHealthResponseDeserialisationTests.cs index 658e0d67f7a..eee4d701187 100644 --- a/tests/Tests/Cluster/ClusterHealth/ClusterHealthResponseDeserialisationTests.cs +++ b/tests/Tests/Cluster/ClusterHealth/ClusterHealthResponseDeserialisationTests.cs @@ -6,7 +6,7 @@ namespace Tests.Cluster.ClusterHealth { - public class ClusterHealthResponseDeserialisationTests : SerialisationTestBase + public class HealthResponseDeserialisationTests : SerialisationTestBase { protected override string ResponseJson => @"{ ""cluster_name"" : ""test-cluster"", @@ -68,7 +68,7 @@ public class ClusterHealthResponseDeserialisationTests : SerialisationTestBase + : ApiIntegrationTestBase { public ClusterHealthShardsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } @@ -22,8 +22,8 @@ public ClusterHealthShardsApiTests(ReadOnlyCluster cluster, EndpointUsage usage) protected override int ExpectStatusCode => 200; protected override HttpMethod HttpMethod => HttpMethod.GET; - protected override Action Fluent => c => c.Level(Level.Shards); - protected override ClusterHealthRequest Initializer => new() { Level = Level.Shards }; + protected override Action Fluent => c => c.Level(Level.Shards); + protected override HealthRequest Initializer => new() { Level = Level.Shards }; protected override string ExpectedUrlPathAndQuery => "/_cluster/health?level=shards"; protected override LazyResponses ClientUsage() => Calls( @@ -33,7 +33,7 @@ protected override LazyResponses ClientUsage() => Calls( (client, r) => client.Cluster.HealthAsync(r) ); - protected override void ExpectResponse(ClusterHealthResponse response) + protected override void ExpectResponse(HealthResponse response) { response.ClusterName.Should().NotBeNullOrWhiteSpace(); response.Status.Should().NotBe(HealthStatus.Red); diff --git a/tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs b/tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs index c62df5a6a28..14d04252c72 100644 --- a/tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs +++ b/tests/Tests/Document/Multiple/DeleteByQuery/DeleteByQueryApiTests.cs @@ -52,7 +52,7 @@ public DeleteByQueryApiTests(IntrusiveOperationCluster cluster, EndpointUsage us { IgnoreUnavailable = true, MaxDocs = Project.Projects.Count, - Query = QueryContainer.Ids(new IdsQuery + Query = Query.Ids(new IdsQuery { Values = new Ids(new[] { Project.First.Name, "x" }) }) @@ -175,7 +175,7 @@ public DeleteByQueryWithFailuresApiTests(IntrusiveOperationCluster cluster, Endp protected override DeleteByQueryRequest Initializer => new(CallIsolatedValue) { - Query = QueryContainer.Match(new MatchQuery(Infer.Field(p => p.Description)) + Query = Query.Match(new MatchQuery(Infer.Field(p => p.Description)) { Query = "description" }) @@ -255,7 +255,7 @@ public DeleteByQueryWithSlicesApiTests(IntrusiveOperationCluster cluster, Endpoi Id = 0, Max = 2 }, - Query = QueryContainer.Terms(new TermsQuery() + Query = Query.Terms(new TermsQuery() { Field = Infer.Field(p => p.Name), Terms = new TermsQueryField(FirstTenProjectNames) diff --git a/tests/Tests/Eql/EqlSearchApiCoordinatedTests.cs b/tests/Tests/Eql/EqlSearchApiCoordinatedTests.cs index 2bc1b99a1cd..5c2ea00d57a 100644 --- a/tests/Tests/Eql/EqlSearchApiCoordinatedTests.cs +++ b/tests/Tests/Eql/EqlSearchApiCoordinatedTests.cs @@ -46,8 +46,8 @@ public EqlSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usage ) }, {StatusStep, u => - u.Calls( - v => new EqlGetStatusRequest(v), + u.Calls( + v => new GetEqlStatusRequest(v), (v, d) => d, (v, c, f) => c.Eql.GetStatus(v, f), (v, c, f) => c.Eql.GetStatusAsync(v, f), @@ -70,8 +70,8 @@ public EqlSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usage } })}, // allows the search to complete {GetStep, u => - u.Calls>( - v => new GetEqlRequest(v), + u.Calls>( + v => new EqlGetRequest(v), (v, d) => d, (v, c, f) => c.Eql.Get(v, f), (v, c, f) => c.Eql.GetAsync(v, f), @@ -81,8 +81,8 @@ public EqlSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usage ) }, {DeleteStep, u => - u.Calls( - v => new DeleteEqlRequest(v), + u.Calls( + v => new EqlDeleteRequest(v), (v, d) => d, (v, c, f) => c.Eql.Delete(v, f), (v, c, f) => c.Eql.DeleteAsync(v, f), @@ -102,7 +102,7 @@ [I] public async Task EqlSearchResponse() => await Assert r.TimedOut.Should().BeFalse(); }); - [I] public async Task EqlSearchStatusResponse() => await Assert(StatusStep, r => + [I] public async Task EqlSearchStatusResponse() => await Assert(StatusStep, r => { r.ShouldBeValid(); r.Id.Should().NotBeNullOrEmpty(); @@ -124,7 +124,7 @@ [I] public async Task EqlSearchStatusResponse() => await Assert await Assert>(GetStep, r => + [I] public async Task EqlGetResponse() => await Assert>(GetStep, r => { r.ShouldBeValid(); r.IsPartial.Should().BeFalse(); @@ -141,7 +141,7 @@ [I] public async Task EqlGetResponse() => await Assert>(GetS firstEvent.Source.Event.Category.Should().BeOneOf(Log.EventCategories); }); - [I] public async Task EqlDeleteResponse() => await Assert(DeleteStep, r => + [I] public async Task EqlDeleteResponse() => await Assert(DeleteStep, r => { r.ShouldBeValid(); r.Acknowledged.Should().BeTrue(); diff --git a/tests/Tests/IndexManagement/CreateIndexSerializationTests.cs b/tests/Tests/IndexManagement/CreateIndexSerializationTests.cs index 5f93cd4b120..f4f33a30c81 100644 --- a/tests/Tests/IndexManagement/CreateIndexSerializationTests.cs +++ b/tests/Tests/IndexManagement/CreateIndexSerializationTests.cs @@ -17,9 +17,9 @@ public class CreateIndexSerializationTests : SerializerTestBase public async Task CreateIndexWithAliases_SerializesCorrectly() { var alias1 = new Alias(); - var alias2 = new Alias { Filter = QueryContainer.Term(new TermQuery("username") { Value = "stevegordon" }), Routing = "shard-1" }; + var alias2 = new Alias { Filter = Query.Term(new TermQuery("username") { Value = "stevegordon" }), Routing = "shard-1" }; - var descriptor = new CreateRequestDescriptor("test") + var descriptor = new CreateIndexRequestDescriptor("test") .Aliases(aliases => aliases .Add("alias_1", alias1) .Add("alias_2", alias2)); @@ -28,7 +28,7 @@ public async Task CreateIndexWithAliases_SerializesCorrectly() await Verifier.VerifyJson(json); - var createRequest = new CreateRequest("test") + var createRequest = new CreateIndexRequest("test") { Aliases = new() { diff --git a/tests/Tests/IndexManagement/Mapping/GetMappingApiTests.cs b/tests/Tests/IndexManagement/Mapping/GetMappingApiTests.cs index a2946fe0363..4b4526d7f91 100644 --- a/tests/Tests/IndexManagement/Mapping/GetMappingApiTests.cs +++ b/tests/Tests/IndexManagement/Mapping/GetMappingApiTests.cs @@ -11,7 +11,7 @@ namespace Tests.IndexManagement.Mapping; -public class GetMappingApiTests : ApiIntegrationTestBase, MappingRequest> +public class GetMappingApiTests : ApiIntegrationTestBase, GetMappingRequest> { public GetMappingApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } @@ -19,8 +19,8 @@ public GetMappingApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(c protected override int ExpectStatusCode => 200; protected override string ExpectedUrlPathAndQuery => "/project/_mapping?ignore_unavailable=true"; protected override HttpMethod HttpMethod => HttpMethod.GET; - protected override Action> Fluent => c => c.Indices(Infer.Index()).IgnoreUnavailable(); - protected override MappingRequest Initializer => new(Infer.Index()) { IgnoreUnavailable = true }; + protected override Action> Fluent => c => c.Indices(Infer.Index()).IgnoreUnavailable(); + protected override GetMappingRequest Initializer => new(Infer.Index()) { IgnoreUnavailable = true }; protected override LazyResponses ClientUsage() => Calls( (client, f) => client.Indices.GetMapping(f), @@ -29,7 +29,7 @@ protected override LazyResponses ClientUsage() => Calls( (client, r) => client.Indices.GetMappingAsync(r) ); - protected override void ExpectResponse(MappingResponse response) + protected override void ExpectResponse(GetMappingResponse response) { var projectMapping = response.Indices[Infer.Index()]; @@ -46,7 +46,7 @@ protected override void ExpectResponse(MappingResponse response) AssertExtensionMethods(response); } - private static void AssertExtensionMethods(MappingResponse response) + private static void AssertExtensionMethods(GetMappingResponse response) { /** The `GetMappingFor` extension method can be used to get a type mapping easily and safely */ response.GetMappingFor().Should().NotBeNull(); @@ -54,7 +54,7 @@ private static void AssertExtensionMethods(MappingResponse response) } } -public class GetMappingNonExistentIndexApiTests : ApiIntegrationTestBase, MappingRequest> +public class GetMappingNonExistentIndexApiTests : ApiIntegrationTestBase, GetMappingRequest> { private const string NonExistentIndex = "non-existent-index"; @@ -64,8 +64,8 @@ public GetMappingNonExistentIndexApiTests(ReadOnlyCluster cluster, EndpointUsage protected override int ExpectStatusCode => 404; protected override string ExpectedUrlPathAndQuery => $"/{NonExistentIndex}/_mapping"; protected override HttpMethod HttpMethod => HttpMethod.GET; - protected override Action> Fluent => c => c.Indices(NonExistentIndex); - protected override MappingRequest Initializer => new(NonExistentIndex); + protected override Action> Fluent => c => c.Indices(NonExistentIndex); + protected override GetMappingRequest Initializer => new(NonExistentIndex); protected override LazyResponses ClientUsage() => Calls( (client, f) => client.Indices.GetMapping(f), @@ -74,7 +74,7 @@ protected override LazyResponses ClientUsage() => Calls( (client, r) => client.Indices.GetMappingAsync(r) ); - protected override void ExpectResponse(MappingResponse response) + protected override void ExpectResponse(GetMappingResponse response) { response.Indices.Should().BeEmpty(); response.ElasticsearchServerError.Should().NotBeNull(); diff --git a/tests/Tests/PointInTime/PointInTimeApiTests.cs b/tests/Tests/PointInTime/PointInTimeApiTests.cs index c6913c2a46d..f08ac9b7472 100644 --- a/tests/Tests/PointInTime/PointInTimeApiTests.cs +++ b/tests/Tests/PointInTime/PointInTimeApiTests.cs @@ -67,7 +67,7 @@ public PointInTimeApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base( // v => new SearchRequest // { // Size = 1, - // Query = new QueryContainer(new MatchAllQuery()), + // Query = new Query(new MatchAllQuery()), // PointInTime = new Nest.PointInTime(v, "1m"), // Sort =new List // { diff --git a/tests/Tests/Search/Count/CountApiTests.cs b/tests/Tests/Search/Count/CountApiTests.cs index 77afdb151b8..7926665b2ee 100644 --- a/tests/Tests/Search/Count/CountApiTests.cs +++ b/tests/Tests/Search/Count/CountApiTests.cs @@ -23,16 +23,13 @@ public CountApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluste protected override int ExpectStatusCode => 200; protected override Action> Fluent => c => c - .Query(QueryContainer.Match(new MatchQuery("name") - { - Query = "NEST" - })); + .Query(q => q.Match(m => m.Field(f => f.Name).Query("NEST"))); protected override HttpMethod HttpMethod => HttpMethod.POST; protected override CountRequest Initializer => new() { - Query = QueryContainer.Match(new MatchQuery("name") + Query = Query.Match(new MatchQuery("name") { Query = "NEST" }) @@ -63,16 +60,13 @@ public CountApiTests_NonGenericDescriptor(ReadOnlyCluster cluster, EndpointUsage protected override Action Fluent => c => c .Indices("project") - .Query(QueryContainer.Match(new MatchQuery("name") - { - Query = "NEST" - })); + .Query(q => q.Match(m => m.Field(Infer.Field(f => f.Name)).Query("NEST"))); protected override HttpMethod HttpMethod => HttpMethod.POST; protected override CountRequest Initializer => new() { - Query = QueryContainer.Match(new MatchQuery("name") + Query = Query.Match(new MatchQuery("name") { Query = "NEST" }) @@ -101,17 +95,14 @@ public CountApi_FluentMatch_ApiTests(ReadOnlyCluster cluster, EndpointUsage usag protected override int ExpectStatusCode => 200; - protected override Action> Fluent => c => c - .Query(q => q - .Match(m => m - .Field(f => f.Name) - .Query("NEST"))); + protected override Action> Fluent => c => + c.Query(q => q.Match(m => m.Field(f => f.Name).Query("NEST"))); protected override HttpMethod HttpMethod => HttpMethod.POST; protected override CountRequest Initializer => new() { - Query = QueryContainer.Match(new MatchQuery("name") + Query = Query.Match(new MatchQuery("name") { Query = "NEST" }) diff --git a/tests/Tests/Search/Search/SearchApiTests.cs b/tests/Tests/Search/Search/SearchApiTests.cs index 6979abc4fbd..d14e7cb09a2 100644 --- a/tests/Tests/Search/Search/SearchApiTests.cs +++ b/tests/Tests/Search/Search/SearchApiTests.cs @@ -334,12 +334,12 @@ protected override void ExpectResponse(SearchResponse response) // { // From = 10, // Size = 20, - // Query = new QueryContainer(new MatchAllQuery()), + // Query = new Query(new MatchAllQuery()), // Aggregations = new TermsAggregation("startDates") // { // Field = "startedOn" // }, - // PostFilter = new QueryContainer(new TermQuery + // PostFilter = new Query(new TermQuery // { // Field = "state", // Value = "Stable" @@ -363,9 +363,9 @@ protected override void ExpectResponse(SearchResponse response) // } //} - //public class SearchApiContainingConditionlessQueryContainerTests : SearchApiTests + //public class SearchApiContainingConditionlessQueryTests : SearchApiTests //{ - // public SearchApiContainingConditionlessQueryContainerTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } + // public SearchApiContainingConditionlessQueryTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } // protected override object ExpectJson => new // { @@ -387,21 +387,21 @@ protected override void ExpectResponse(SearchResponse response) // m => m.QueryString(qs => qs.Query("query")), // m => m.QueryString(qs => qs.Query(string.Empty)), // m => m.QueryString(qs => qs.Query(null)), - // m => new QueryContainer(), + // m => new Query(), // null // ) // .Should( // m => m.QueryString(qs => qs.Query("query")), // m => m.QueryString(qs => qs.Query(string.Empty)), // m => m.QueryString(qs => qs.Query(null)), - // m => new QueryContainer(), + // m => new Query(), // null // ) // .MustNot( // m => m.QueryString(qs => qs.Query("query")), // m => m.QueryString(qs => qs.Query(string.Empty)), // m => m.QueryString(qs => qs.Query(null)), - // m => new QueryContainer(), + // m => new Query(), // null // ) // ) @@ -411,28 +411,28 @@ protected override void ExpectResponse(SearchResponse response) // { // Query = new BoolQuery // { - // Must = new List + // Must = new List // { // new QueryStringQuery { Query = "query" }, // new QueryStringQuery { Query = string.Empty }, // new QueryStringQuery { Query = null }, - // new QueryContainer(), + // new Query(), // null // }, - // Should = new List + // Should = new List // { // new QueryStringQuery { Query = "query" }, // new QueryStringQuery { Query = string.Empty }, // new QueryStringQuery { Query = null }, - // new QueryContainer(), + // new Query(), // null // }, - // MustNot = new List + // MustNot = new List // { // new QueryStringQuery { Query = "query" }, // new QueryStringQuery { Query = string.Empty }, // new QueryStringQuery { Query = null }, - // new QueryContainer(), + // new Query(), // null // } // } @@ -441,18 +441,18 @@ protected override void ExpectResponse(SearchResponse response) // protected override void ExpectResponse(ISearchResponse response) => response.ShouldBeValid(); //} - //public class SearchApiNullQueryContainerTests : SearchApiTests + //public class SearchApiNullQueryTests : SearchApiTests //{ - // public SearchApiNullQueryContainerTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } + // public SearchApiNullQueryTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } // protected override object ExpectJson => new { }; // protected override Func, ISearchRequest> Fluent => s => s // .Query(q => q // .Bool(b => b - // .Must((Func, QueryContainer>)null) - // .Should((Func, QueryContainer>)null) - // .MustNot((Func, QueryContainer>)null) + // .Must((Func, Query>)null) + // .Should((Func, Query>)null) + // .MustNot((Func, Query>)null) // ) // ); @@ -469,9 +469,9 @@ protected override void ExpectResponse(SearchResponse response) // protected override void ExpectResponse(ISearchResponse response) => response.ShouldBeValid(); //} - //public class SearchApiNullQueriesInQueryContainerTests : SearchApiTests + //public class SearchApiNullQueriesInQueryTests : SearchApiTests //{ - // public SearchApiNullQueriesInQueryContainerTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } + // public SearchApiNullQueriesInQueryTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } // protected override object ExpectJson => new // { @@ -489,9 +489,9 @@ protected override void ExpectResponse(SearchResponse response) // { // b.Verbatim(); // IBoolQuery bq = b; - // bq.Must = new QueryContainer[] { null }; - // bq.Should = new QueryContainer[] { null }; - // bq.MustNot = new QueryContainer[] { null }; + // bq.Must = new Query[] { null }; + // bq.Should = new Query[] { null }; + // bq.MustNot = new Query[] { null }; // return bq; // }) // ); @@ -501,9 +501,9 @@ protected override void ExpectResponse(SearchResponse response) // Query = new BoolQuery // { // IsVerbatim = true, - // Must = new QueryContainer[] { null }, - // Should = new QueryContainer[] { null }, - // MustNot = new QueryContainer[] { null } + // Must = new Query[] { null }, + // Should = new Query[] { null }, + // MustNot = new Query[] { null } // } // }; @@ -657,7 +657,7 @@ protected override void ExpectResponse(SearchResponse response) // protected override SearchRequest Initializer => new SearchRequest(Nest.Indices.All) // { // Size = 1, - // Query = new QueryContainer(new MatchAllQuery()), + // Query = new Query(new MatchAllQuery()), // PointInTime = new Nest.PointInTime("a-long-id", "1m") // }; @@ -724,7 +724,7 @@ protected override void ExpectResponse(SearchResponse response) // protected override SearchRequest Initializer => new() // { // Size = 5, - // Query = new QueryContainer(new MatchAllQuery()), + // Query = new Query(new MatchAllQuery()), // Fields = Infer.Field(p => p.StartedOnDayOfWeek) // .And(p => p.ThirtyDaysFromStarted, format: DateFormat.basic_date) // .And(RuntimeFieldName), @@ -801,7 +801,7 @@ protected override void ExpectResponse(SearchResponse response) // protected override SearchRequest Initializer => new() // { // Size = 5, - // Query = new QueryContainer(new MatchAllQuery()), + // Query = new Query(new MatchAllQuery()), // Sort = new List // { // new FieldSort diff --git a/tests/Tests/Serialization/Aggregations/MinAggregationDeserializationTests.cs b/tests/Tests/Serialization/Aggregations/MinAggregationDeserializationTests.cs index d12c707a95e..e27d279840f 100644 --- a/tests/Tests/Serialization/Aggregations/MinAggregationDeserializationTests.cs +++ b/tests/Tests/Serialization/Aggregations/MinAggregationDeserializationTests.cs @@ -15,7 +15,7 @@ public void CanDeserialize() var stream = WrapInStream(json); - var aggregationContainer = _requestResponseSerializer.Deserialize(stream); + var aggregationContainer = _requestResponseSerializer.Deserialize(stream); //aggregationContainer.Meta.Should().HaveCount(3); diff --git a/tests/Tests/Serialization/Aggregations/WritingAggregationsTests.cs b/tests/Tests/Serialization/Aggregations/WritingAggregationsTests.cs index 64247aecb78..55aecc7cc06 100644 --- a/tests/Tests/Serialization/Aggregations/WritingAggregationsTests.cs +++ b/tests/Tests/Serialization/Aggregations/WritingAggregationsTests.cs @@ -19,7 +19,7 @@ public async Task CanSerializeAggregationsWrittenInVariousWays_WhichIncludeMulti // ** First test that the descriptor produces the expected JSON. - var descriptor = new AggregationContainerDescriptor(aggs => aggs + var descriptor = new AggregationDescriptor(aggs => aggs .Children("name_of_child_agg", child => child .Type("commits") .Aggregations(childAggs => childAggs diff --git a/tests/Tests/Serialization/Documents/MGetSerialization.cs b/tests/Tests/Serialization/Documents/MGetSerialization.cs index ce8e3f91852..2f4fefb12b1 100644 --- a/tests/Tests/Serialization/Documents/MGetSerialization.cs +++ b/tests/Tests/Serialization/Documents/MGetSerialization.cs @@ -61,7 +61,7 @@ public async Task SerializesRequestWithSingleDocs() { var request = new MultiGetRequest() { - Docs = new[] { new Operation { Index = "test-index", Id = "single-value" } } + Docs = new[] { new MultiGetOperation { Index = "test-index", Id = "single-value" } } }; var json = SerializeAndGetJsonString(request); @@ -75,8 +75,8 @@ public async Task SerializesRequestWithMultipleDocs() { Docs = new[] { - new Operation { Index = "test-index", Id = "value-a" }, - new Operation { Index = "test-index", Id = "value-b" } + new MultiGetOperation { Index = "test-index", Id = "value-a" }, + new MultiGetOperation { Index = "test-index", Id = "value-b" } } }; @@ -107,7 +107,7 @@ public async Task SerializesDescriptorWithMultipleIds() public async Task SerializesDescriptorWithSingleDocsAsValue() { var request = new MultiGetRequestDescriptor() - .Docs(new[] { new Operation { Index = "test-index", Id = "single-value" } }); + .Docs(new[] { new MultiGetOperation { Index = "test-index", Id = "single-value" } }); var json = SerializeAndGetJsonString(request); await Verifier.VerifyJson(json); @@ -119,8 +119,8 @@ public async Task SerializesDescriptorWithMultipleDocsAsValue() var request = new MultiGetRequestDescriptor() .Docs(new[] { - new Operation { Index = "test-index", Id = "value-a" }, - new Operation { Index = "test-index", Id = "value-b" } + new MultiGetOperation { Index = "test-index", Id = "value-a" }, + new MultiGetOperation { Index = "test-index", Id = "value-b" } }); var json = SerializeAndGetJsonString(request); @@ -141,7 +141,7 @@ public async Task SerializesDescriptorWithSingleDocsAsDescriptorAction() public async Task SerializesDescriptorWithSingleDocsAsDescriptor() { var request = new MultiGetRequestDescriptor() - .Docs(new OperationDescriptor().Index("test-index").Id("single-value")); + .Docs(new MultiGetOperationDescriptor().Index("test-index").Id("single-value")); var json = SerializeAndGetJsonString(request); await Verifier.VerifyJson(json); diff --git a/tests/Tests/Serialization/Mapping/MappingResponseSerializationTests.cs b/tests/Tests/Serialization/Mapping/MappingResponseSerializationTests.cs index b500d883b59..88b07889ed8 100644 --- a/tests/Tests/Serialization/Mapping/MappingResponseSerializationTests.cs +++ b/tests/Tests/Serialization/Mapping/MappingResponseSerializationTests.cs @@ -6,14 +6,14 @@ namespace Tests.Serialization.Mapping; -public class MappingResponseSerializationTests : SerializerTestBase +public class GetMappingResponseSerializationTests : SerializerTestBase { private const string ResponseJson = @"{""project"":{""mappings"":{""_routing"":{""required"":true},""properties"":{""dateString"":{""type"":""date""}}}}}"; [U] public void CanDeserialize_MappingResponse() { - var reponse = DeserializeJsonString(ResponseJson); + var reponse = DeserializeJsonString(ResponseJson); reponse.Indices["project"].Mappings.Properties["dateString"].Type.Should().Be("date"); } } diff --git a/tests/Tests/Serialization/Queries/FieldNameQueryConverterTests.cs b/tests/Tests/Serialization/Queries/FieldNameQueryConverterTests.cs index e4b15365e24..bf80a33f427 100644 --- a/tests/Tests/Serialization/Queries/FieldNameQueryConverterTests.cs +++ b/tests/Tests/Serialization/Queries/FieldNameQueryConverterTests.cs @@ -10,24 +10,24 @@ namespace Tests.Serialization.Queries; [UsesVerify] -public class QueryContainer_WithFieldNameQuery_SerializationTests : SerializerTestBase +public class Query_WithFieldNameQuery_SerializationTests : SerializerTestBase { private const string BasicMatchQueryJson = @"{""match"":{""name"":{""query"":""NEST""}}}"; [U] - public async Task CanSerialize_QueryContainerDescriptor_WithSimpleMatchQuery() + public async Task CanSerialize_QueryDescriptor_WithSimpleMatchQuery() { - var descriptor = new QueryContainerDescriptor(c => c.Match(m => m.Field("name").Query("NEST"))); + var descriptor = new QueryDescriptor(c => c.Match(m => m.Field("name").Query("NEST"))); var json = SerializeAndGetJsonString(descriptor); await Verifier.VerifyJson(json); } [U] - public async Task CanDeserialize_QueryContainer_WithSimpleMatchQuery() + public async Task CanDeserialize_Query_WithSimpleMatchQuery() { var stream = WrapInStream(BasicMatchQueryJson); - var queryContainer = _requestResponseSerializer.Deserialize(stream); + var queryContainer = _requestResponseSerializer.Deserialize(stream); var matchQuery = queryContainer.Variant.Should().BeOfType().Subject; await Verifier.Verify(matchQuery); } diff --git a/tests/Tests/Serialization/Queries/IntervalsQuerySerializationTests.cs b/tests/Tests/Serialization/Queries/IntervalsQuerySerializationTests.cs index 2cb18f7aebc..0a660252a9c 100644 --- a/tests/Tests/Serialization/Queries/IntervalsQuerySerializationTests.cs +++ b/tests/Tests/Serialization/Queries/IntervalsQuerySerializationTests.cs @@ -74,7 +74,7 @@ public void IntervalsQuery_CanDeserialize() { var stream = WrapInStream(@"{""intervals"":{""name"":{""boost"":2,""match"":{""max_gaps"":1,""ordered"":true,""query"":""Steve""},""_name"":""testing-intervals""}}}"); - var queryContainer = _requestResponseSerializer.Deserialize(stream); + var queryContainer = _requestResponseSerializer.Deserialize(stream); var intervalsQuery = queryContainer.Variant.Should().BeOfType().Subject; intervalsQuery.Boost.Should().Be(2.0f); diff --git a/tests/Tests/Serialization/Queries/MultipleSearchFiltersTests.cs b/tests/Tests/Serialization/Queries/MultipleSearchFiltersTests.cs index 8f31a7bbf20..0ec1b5a2034 100644 --- a/tests/Tests/Serialization/Queries/MultipleSearchFiltersTests.cs +++ b/tests/Tests/Serialization/Queries/MultipleSearchFiltersTests.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Threading.Tasks; -using Elastic.Clients.Elasticsearch.QueryDsl; -using Tests.Domain; using VerifyXunit; namespace Tests.Serialization; @@ -28,20 +26,20 @@ public async Task CanSerialize_MultipleFilters() await Verifier.VerifyJson(serialisedJson); } - [U] - public async Task CanSerialize_DateRangeFilter() - { - var search = new SearchRequestDescriptor(search => search - .Query(q => q - .Bool(b => b - .Filter( // TODO - Update once we have fluent unions - f => f.Range(new RangeQuery(new DateRangeQuery(Infer.Field(f => f.LastActivity)) { Gte = "now-1d/d", Lt = "now/d" })) - )))); + //[U] + //public async Task CanSerialize_DateRangeFilter() + //{ + // var search = new SearchRequestDescriptor(search => search + // .Query(q => q + // .Bool(b => b + // .Filter( // TODO - Update once we have fluent unions + // f => f.Range(new RangeQuery(new DateRangeQuery(Infer.Field(f => f.LastActivity)) { Gte = "now-1d/d", Lt = "now/d" })) + // )))); - var serialisedJson = await SerializeAndGetJsonStringAsync(search); + // var serialisedJson = await SerializeAndGetJsonStringAsync(search); - await Verifier.VerifyJson(serialisedJson); - } + // await Verifier.VerifyJson(serialisedJson); + //} private class Person { diff --git a/tests/Tests/Serialization/Queries/SearchSerializationTests.cs b/tests/Tests/Serialization/Queries/SearchSerializationTests.cs index 8e93a0be4e0..21c735b2015 100644 --- a/tests/Tests/Serialization/Queries/SearchSerializationTests.cs +++ b/tests/Tests/Serialization/Queries/SearchSerializationTests.cs @@ -15,7 +15,7 @@ public class SearchSerializationTests : SerializerTestBase [U] public async Task Search_WithMatchQuery_SerializesInferredField_ForObjectInitializer() { - var container = QueryContainer.Match(new MatchQuery(Infer.Field(d => d.Description)) + var container = Query.Match(new MatchQuery(Infer.Field(d => d.Description)) { Query = "testing" }); @@ -28,7 +28,7 @@ public async Task Search_WithMatchQuery_SerializesInferredField_ForObjectInitial [U] public async Task Search_WithTermsQuery_Serializes_ForObjectInitializer() { - var container = QueryContainer.Terms(new TermsQuery + var container = Query.Terms(new TermsQuery { Field = Infer.Field(d => d.Description), Terms = new TermsQueryField(new FieldValue[] { "term1", "term2" }), @@ -43,7 +43,7 @@ public async Task Search_WithTermsQuery_Serializes_ForObjectInitializer() [U] public async Task Search_WithTermsQuery_Serializes_ForDescriptor() { - var container = new QueryContainerDescriptor(q => q. + var container = new QueryDescriptor(q => q. Terms(t => t .Boost(1.2f) .Field(f => f.Description) diff --git a/tests/Tests/Serialization/ReadOnlyIndexNameDictionaryTests.cs b/tests/Tests/Serialization/ReadOnlyIndexNameDictionaryTests.cs index 6ac10a0b348..126a5a727cc 100644 --- a/tests/Tests/Serialization/ReadOnlyIndexNameDictionaryTests.cs +++ b/tests/Tests/Serialization/ReadOnlyIndexNameDictionaryTests.cs @@ -22,7 +22,7 @@ public void DeserializesCorrectly_AndCanLookupByInferredName() var stream = WrapInStream(json); - var response = _requestResponseSerializer.Deserialize(stream); + var response = _requestResponseSerializer.Deserialize(stream); response.Indices.Should() .NotBeEmpty() @@ -36,7 +36,7 @@ public void DeserializesCorrectly_AndCanLookupByInferredName() .And.ContainKey(Inferrer.IndexName()); } - private class SimplifiedClusterHealthResponse + private class SimplifiedHealthResponse { [JsonInclude] [JsonPropertyName("indices")] @@ -55,7 +55,7 @@ public void DeserializesCorrectly_AndHandleEmptyDictionaries() var stream = WrapInStream(json); - var response = _requestResponseSerializer.Deserialize(stream); + var response = _requestResponseSerializer.Deserialize(stream); response.IndicesTwo.HasValue.Should().BeTrue(); #pragma warning disable CS8629 // Nullable value type may be null. diff --git a/tests/Tests/Sql/ClearSqlCursorApiTests.cs b/tests/Tests/Sql/ClearSqlCursorApiTests.cs index 21c0d56e839..d0bf3238fe3 100644 --- a/tests/Tests/Sql/ClearSqlCursorApiTests.cs +++ b/tests/Tests/Sql/ClearSqlCursorApiTests.cs @@ -12,7 +12,7 @@ namespace Tests.Sql.ClearSqlCursor; public class ClearSqlCursorApiTests - : ApiIntegrationTestBase + : ApiIntegrationTestBase { private static readonly string SqlQuery = $@"SELECT type, name, startedOn, numberOfCommits @@ -29,11 +29,11 @@ public ClearSqlCursorApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : ba protected override object ExpectJson => new { cursor = _currentCursor }; protected override int ExpectStatusCode => 200; - protected override Action Fluent => d => d.Cursor(_currentCursor); + protected override Action Fluent => d => d.Cursor(_currentCursor); protected override HttpMethod HttpMethod => HttpMethod.POST; - protected override SqlClearCursorRequest Initializer => new() + protected override ClearCursorRequest Initializer => new() { Cursor = _currentCursor, }; @@ -56,6 +56,6 @@ protected override void OnBeforeCall(ElasticsearchClient client) _currentCursor = sqlQueryResponse.Cursor ?? _currentCursor; } - protected override void ExpectResponse(SqlClearCursorResponse response) => + protected override void ExpectResponse(ClearCursorResponse response) => response.Succeeded.Should().BeTrue("succeeded property on response"); } diff --git a/tests/Tests/Sql/SqlSearchApiCoordinatedTests.cs b/tests/Tests/Sql/SqlSearchApiCoordinatedTests.cs index 42dd8397706..d54b2afeb47 100644 --- a/tests/Tests/Sql/SqlSearchApiCoordinatedTests.cs +++ b/tests/Tests/Sql/SqlSearchApiCoordinatedTests.cs @@ -31,8 +31,8 @@ public SqlSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usage { { SubmitStep, u => - u.Calls( - _ => new SqlQueryRequest { Query = SqlQuery, FetchSize = 5, WaitForCompletionTimeout = "0s" }, + u.Calls( + _ => new QueryRequest { Query = SqlQuery, FetchSize = 5, WaitForCompletionTimeout = "0s" }, (_, d) => d .Query(SqlQuery) .FetchSize(5) @@ -46,8 +46,8 @@ public SqlSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usage }, { StatusStep, u => - u.Calls( - v => new SqlGetAsyncStatusRequest(v), + u.Calls( + v => new GetAsyncStatusRequest(v), (v, d) => d, (v, c, f) => c.Sql.GetAsyncSearchStatus(v, f), (v, c, f) => c.Sql.GetAsyncSearchStatusAsync(v, f), @@ -74,8 +74,8 @@ public SqlSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usage }, { GetStep, u => - u.Calls( - v => new SqlGetAsyncRequest(v), + u.Calls( + v => new GetAsyncRequest(v), (_, d) => d, (v, c, f) => c.Sql.GetAsyncSearch(v, f), (v, c, f) => c.Sql.GetAsyncSearchAsync(v, f), @@ -86,8 +86,8 @@ public SqlSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usage }, { DeleteStep, u => - u.Calls( - v => new SqlDeleteAsyncRequest(v), + u.Calls( + v => new DeleteAsyncRequest(v), (_, d) => d, (v, c, f) => c.Sql.DeleteAsyncSearch(v, f), (v, c, f) => c.Sql.DeleteAsyncSearchAsync(v, f), @@ -98,7 +98,7 @@ public SqlSearchApiCoordinatedTests(ReadOnlyCluster cluster, EndpointUsage usage } }) { } - [I] public async Task SqlSearchResponse() => await Assert(SubmitStep, r => + [I] public async Task SqlSearchResponse() => await Assert(SubmitStep, r => { r.ShouldBeValid(); r.Id.Should().NotBeNullOrEmpty(); @@ -106,7 +106,7 @@ [I] public async Task SqlSearchResponse() => await Assert(Subm r.IsRunning.Should().BeTrue(); }); - [I] public async Task SqlSearchStatusResponse() => await Assert(StatusStep, r => + [I] public async Task SqlSearchStatusResponse() => await Assert(StatusStep, r => { r.ShouldBeValid(); r.Id.Should().NotBeNullOrEmpty(); @@ -126,7 +126,7 @@ [I] public async Task SqlSearchStatusResponse() => await Assert await Assert(GetStep, r => + [I] public async Task SqlGetResponse() => await Assert(GetStep, r => { r.ShouldBeValid(); r.IsPartial.Should().BeFalse(); @@ -151,7 +151,7 @@ [I] public async Task SqlGetResponse() => await Assert(GetS } }); - [I] public async Task SqlDeleteResponse() => await Assert(DeleteStep, r => + [I] public async Task SqlDeleteResponse() => await Assert(DeleteStep, r => { r.ShouldBeValid(); r.Acknowledged.Should().BeTrue(); diff --git a/tests/Tests/_VerifySnapshots/QueryContainer_WithFieldNameQuery_SerializationTests.CanDeserialize_QueryContainer_WithSimpleMatchQuery.verified.txt b/tests/Tests/_VerifySnapshots/Query_WithFieldNameQuery_SerializationTests.CanDeserialize_Query_WithSimpleMatchQuery.verified.txt similarity index 100% rename from tests/Tests/_VerifySnapshots/QueryContainer_WithFieldNameQuery_SerializationTests.CanDeserialize_QueryContainer_WithSimpleMatchQuery.verified.txt rename to tests/Tests/_VerifySnapshots/Query_WithFieldNameQuery_SerializationTests.CanDeserialize_Query_WithSimpleMatchQuery.verified.txt diff --git a/tests/Tests/_VerifySnapshots/QueryContainer_WithFieldNameQuery_SerializationTests.CanSerialize_QueryContainerDescriptor_WithSimpleMatchQuery.verified.txt b/tests/Tests/_VerifySnapshots/Query_WithFieldNameQuery_SerializationTests.CanSerialize_QueryDescriptor_WithSimpleMatchQuery.verified.txt similarity index 100% rename from tests/Tests/_VerifySnapshots/QueryContainer_WithFieldNameQuery_SerializationTests.CanSerialize_QueryContainerDescriptor_WithSimpleMatchQuery.verified.txt rename to tests/Tests/_VerifySnapshots/Query_WithFieldNameQuery_SerializationTests.CanSerialize_QueryDescriptor_WithSimpleMatchQuery.verified.txt