From bdcfcb324660fea2b19a40d0da0de35a39643fef Mon Sep 17 00:00:00 2001 From: Sylvain Wallez Date: Tue, 23 Nov 2021 09:54:25 +0100 Subject: [PATCH] Unify Operator and DefaultOperator enums (#1047) --- output/schema/schema.json | 43 ++++++------------- output/typescript/types.ts | 16 +++---- specification/_global/count/CountRequest.ts | 11 ++--- .../delete_by_query/DeleteByQueryRequest.ts | 4 +- .../_global/explain/ExplainRequest.ts | 12 ++---- specification/_global/search/SearchRequest.ts | 4 +- .../update_by_query/UpdateByQueryRequest.ts | 4 +- specification/_types/common.ts | 5 --- .../submit/AsyncSearchSubmitRequest.ts | 4 +- .../IndicesValidateQueryRequest.ts | 10 ++--- 10 files changed, 38 insertions(+), 75 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index ac242e263a..7feac614f6 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -14262,8 +14262,8 @@ "type": { "kind": "instance_of", "type": { - "name": "DefaultOperator", - "namespace": "_types" + "name": "Operator", + "namespace": "_types.query_dsl" } } }, @@ -14907,8 +14907,8 @@ "type": { "kind": "instance_of", "type": { - "name": "DefaultOperator", - "namespace": "_types" + "name": "Operator", + "namespace": "_types.query_dsl" } } }, @@ -16127,8 +16127,8 @@ "type": { "kind": "instance_of", "type": { - "name": "DefaultOperator", - "namespace": "_types" + "name": "Operator", + "namespace": "_types.query_dsl" } } }, @@ -22446,8 +22446,8 @@ "type": { "kind": "instance_of", "type": { - "name": "DefaultOperator", - "namespace": "_types" + "name": "Operator", + "namespace": "_types.query_dsl" } } }, @@ -30295,8 +30295,8 @@ "type": { "kind": "instance_of", "type": { - "name": "DefaultOperator", - "namespace": "_types" + "name": "Operator", + "namespace": "_types.query_dsl" } } }, @@ -31623,21 +31623,6 @@ } } }, - { - "kind": "enum", - "members": [ - { - "name": "AND" - }, - { - "name": "OR" - } - ], - "name": { - "name": "DefaultOperator", - "namespace": "_types" - } - }, { "generics": [ { @@ -65883,8 +65868,8 @@ "type": { "kind": "instance_of", "type": { - "name": "DefaultOperator", - "namespace": "_types" + "name": "Operator", + "namespace": "_types.query_dsl" } } }, @@ -103288,8 +103273,8 @@ "type": { "kind": "instance_of", "type": { - "name": "DefaultOperator", - "namespace": "_types" + "name": "Operator", + "namespace": "_types.query_dsl" } } }, diff --git a/output/typescript/types.ts b/output/typescript/types.ts index d3e83f6f01..f30d03ee88 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -122,7 +122,7 @@ export interface CountRequest extends RequestBase { allow_no_indices?: boolean analyzer?: string analyze_wildcard?: boolean - default_operator?: DefaultOperator + default_operator?: QueryDslOperator df?: string expand_wildcards?: ExpandWildcards ignore_throttled?: boolean @@ -184,7 +184,7 @@ export interface DeleteByQueryRequest extends RequestBase { analyzer?: string analyze_wildcard?: boolean conflicts?: Conflicts - default_operator?: DefaultOperator + default_operator?: QueryDslOperator df?: string expand_wildcards?: ExpandWildcards from?: long @@ -307,7 +307,7 @@ export interface ExplainRequest extends RequestBase { type?: Type analyzer?: string analyze_wildcard?: boolean - default_operator?: DefaultOperator + default_operator?: QueryDslOperator df?: string lenient?: boolean preference?: string @@ -936,7 +936,7 @@ export interface SearchRequest extends RequestBase { analyze_wildcard?: boolean batched_reduce_size?: long ccs_minimize_roundtrips?: boolean - default_operator?: DefaultOperator + default_operator?: QueryDslOperator df?: string docvalue_fields?: Fields expand_wildcards?: ExpandWildcards @@ -1767,7 +1767,7 @@ export interface UpdateByQueryRequest extends RequestBase { analyzer?: string analyze_wildcard?: boolean conflicts?: Conflicts - default_operator?: DefaultOperator + default_operator?: QueryDslOperator df?: string expand_wildcards?: ExpandWildcards from?: long @@ -1917,8 +1917,6 @@ export type DateMathTime = string export type DateString = string -export type DefaultOperator = 'AND' | 'OR' - export interface DictionaryResponseBase { [key: string]: TValue } @@ -5620,7 +5618,7 @@ export interface AsyncSearchSubmitRequest extends RequestBase { analyze_wildcard?: boolean batched_reduce_size?: long ccs_minimize_roundtrips?: boolean - default_operator?: DefaultOperator + default_operator?: QueryDslOperator df?: string docvalue_fields?: Fields expand_wildcards?: ExpandWildcards @@ -10316,7 +10314,7 @@ export interface IndicesValidateQueryRequest extends RequestBase { all_shards?: boolean analyzer?: string analyze_wildcard?: boolean - default_operator?: DefaultOperator + default_operator?: QueryDslOperator df?: string expand_wildcards?: ExpandWildcards explain?: boolean diff --git a/specification/_global/count/CountRequest.ts b/specification/_global/count/CountRequest.ts index 5f1f12de27..62e9dcc255 100644 --- a/specification/_global/count/CountRequest.ts +++ b/specification/_global/count/CountRequest.ts @@ -18,15 +18,10 @@ */ import { RequestBase } from '@_types/Base' -import { - DefaultOperator, - ExpandWildcards, - Indices, - Routing, - Types -} from '@_types/common' +import { ExpandWildcards, Indices, Routing, Types } from '@_types/common' import { double, long } from '@_types/Numeric' import { QueryContainer } from '@_types/query_dsl/abstractions' +import { Operator } from '@_types/query_dsl/Operator' /** * @rest_spec_name count @@ -42,7 +37,7 @@ export interface Request extends RequestBase { allow_no_indices?: boolean analyzer?: string analyze_wildcard?: boolean - default_operator?: DefaultOperator + default_operator?: Operator df?: string expand_wildcards?: ExpandWildcards ignore_throttled?: boolean diff --git a/specification/_global/delete_by_query/DeleteByQueryRequest.ts b/specification/_global/delete_by_query/DeleteByQueryRequest.ts index 197772e43f..751c5d5eee 100644 --- a/specification/_global/delete_by_query/DeleteByQueryRequest.ts +++ b/specification/_global/delete_by_query/DeleteByQueryRequest.ts @@ -20,7 +20,6 @@ import { RequestBase } from '@_types/Base' import { Conflicts, - DefaultOperator, ExpandWildcards, Fields, Indices, @@ -34,6 +33,7 @@ import { QueryContainer } from '@_types/query_dsl/abstractions' import { SlicedScroll } from '@_types/SlicedScroll' import { Time } from '@_types/Time' import { SourceConfigParam } from '@global/search/_types/SourceFilter' +import { Operator } from '@_types/query_dsl/Operator' /** * @rest_spec_name delete_by_query @@ -50,7 +50,7 @@ export interface Request extends RequestBase { analyzer?: string analyze_wildcard?: boolean conflicts?: Conflicts - default_operator?: DefaultOperator + default_operator?: Operator df?: string expand_wildcards?: ExpandWildcards from?: long diff --git a/specification/_global/explain/ExplainRequest.ts b/specification/_global/explain/ExplainRequest.ts index c8d19e9ac3..e628925879 100644 --- a/specification/_global/explain/ExplainRequest.ts +++ b/specification/_global/explain/ExplainRequest.ts @@ -18,16 +18,10 @@ */ import { RequestBase } from '@_types/Base' -import { - DefaultOperator, - Fields, - Id, - IndexName, - Routing, - Type -} from '@_types/common' +import { Fields, Id, IndexName, Routing, Type } from '@_types/common' import { QueryContainer } from '@_types/query_dsl/abstractions' import { SourceConfigParam } from '@global/search/_types/SourceFilter' +import { Operator } from '@_types/query_dsl/Operator' /** * @rest_spec_name explain @@ -43,7 +37,7 @@ export interface Request extends RequestBase { query_parameters: { analyzer?: string analyze_wildcard?: boolean - default_operator?: DefaultOperator + default_operator?: Operator df?: string lenient?: boolean preference?: string diff --git a/specification/_global/search/SearchRequest.ts b/specification/_global/search/SearchRequest.ts index abe5c768da..a61fb803e0 100644 --- a/specification/_global/search/SearchRequest.ts +++ b/specification/_global/search/SearchRequest.ts @@ -21,7 +21,6 @@ import { Dictionary } from '@spec_utils/Dictionary' import { AggregationContainer } from '@_types/aggregations/AggregationContainer' import { RequestBase } from '@_types/Base' import { - DefaultOperator, ExpandWildcards, Field, Fields, @@ -47,6 +46,7 @@ import { Sort, SortResults } from './_types/sort' import { SourceConfigParam, SourceConfig } from './_types/SourceFilter' import { Suggester } from './_types/suggester' import { TrackHits } from '@global/search/_types/hits' +import { Operator } from '@_types/query_dsl/Operator' /** * @rest_spec_name search @@ -65,7 +65,7 @@ export interface Request extends RequestBase { analyze_wildcard?: boolean batched_reduce_size?: long ccs_minimize_roundtrips?: boolean - default_operator?: DefaultOperator + default_operator?: Operator df?: string docvalue_fields?: Fields expand_wildcards?: ExpandWildcards diff --git a/specification/_global/update_by_query/UpdateByQueryRequest.ts b/specification/_global/update_by_query/UpdateByQueryRequest.ts index 0971b85e38..7a3758f2e2 100644 --- a/specification/_global/update_by_query/UpdateByQueryRequest.ts +++ b/specification/_global/update_by_query/UpdateByQueryRequest.ts @@ -20,7 +20,6 @@ import { RequestBase } from '@_types/Base' import { Conflicts, - DefaultOperator, ExpandWildcards, Fields, Indices, @@ -35,6 +34,7 @@ import { Script } from '@_types/Scripting' import { SlicedScroll } from '@_types/SlicedScroll' import { Time } from '@_types/Time' import { SourceConfigParam } from '@global/search/_types/SourceFilter' +import { Operator } from '@_types/query_dsl/Operator' /** * @rest_spec_name update_by_query @@ -51,7 +51,7 @@ export interface Request extends RequestBase { analyzer?: string analyze_wildcard?: boolean conflicts?: Conflicts - default_operator?: DefaultOperator + default_operator?: Operator df?: string expand_wildcards?: ExpandWildcards from?: long diff --git a/specification/_types/common.ts b/specification/_types/common.ts index 1a17dbbcd8..1b5ff62c88 100644 --- a/specification/_types/common.ts +++ b/specification/_types/common.ts @@ -170,11 +170,6 @@ export enum Conflicts { export type Username = string export type Password = string -export enum DefaultOperator { - AND = 0, - OR = 1 -} - export class ElasticsearchResponseBase {} export class ElasticsearchUrlFormatter {} diff --git a/specification/async_search/submit/AsyncSearchSubmitRequest.ts b/specification/async_search/submit/AsyncSearchSubmitRequest.ts index df8c86bdb7..f6fe0a47a4 100644 --- a/specification/async_search/submit/AsyncSearchSubmitRequest.ts +++ b/specification/async_search/submit/AsyncSearchSubmitRequest.ts @@ -21,7 +21,6 @@ import { Dictionary } from '@spec_utils/Dictionary' import { AggregationContainer } from '@_types/aggregations/AggregationContainer' import { RequestBase } from '@_types/Base' import { - DefaultOperator, ExpandWildcards, Field, Fields, @@ -49,6 +48,7 @@ import { } from '@global/search/_types/SourceFilter' import { Suggester } from '@global/search/_types/suggester' import { TrackHits } from '@global/search/_types/hits' +import { Operator } from '@_types/query_dsl/Operator' /** * @rest_spec_name async_search.submit @@ -73,7 +73,7 @@ export interface Request extends RequestBase { analyze_wildcard?: boolean batched_reduce_size?: long ccs_minimize_roundtrips?: boolean - default_operator?: DefaultOperator + default_operator?: Operator df?: string docvalue_fields?: Fields expand_wildcards?: ExpandWildcards diff --git a/specification/indices/validate_query/IndicesValidateQueryRequest.ts b/specification/indices/validate_query/IndicesValidateQueryRequest.ts index a0e6874998..4c83b5a32f 100644 --- a/specification/indices/validate_query/IndicesValidateQueryRequest.ts +++ b/specification/indices/validate_query/IndicesValidateQueryRequest.ts @@ -18,13 +18,9 @@ */ import { RequestBase } from '@_types/Base' -import { - DefaultOperator, - ExpandWildcards, - Indices, - Types -} from '@_types/common' +import { ExpandWildcards, Indices, Types } from '@_types/common' import { QueryContainer } from '@_types/query_dsl/abstractions' +import { Operator } from '@_types/query_dsl/Operator' /** * @rest_spec_name indices.validate_query @@ -41,7 +37,7 @@ export interface Request extends RequestBase { all_shards?: boolean analyzer?: string analyze_wildcard?: boolean - default_operator?: DefaultOperator + default_operator?: Operator df?: string expand_wildcards?: ExpandWildcards explain?: boolean