Skip to content

Unify Operator and DefaultOperator enums (#1047) #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 23, 2021
Merged

Unify Operator and DefaultOperator enums (#1047) #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 14 additions & 29 deletions output/schema/schema.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions output/typescript/types.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions specification/_global/count/CountRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions specification/_global/delete_by_query/DeleteByQueryRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import { RequestBase } from '@_types/Base'
import {
Conflicts,
DefaultOperator,
ExpandWildcards,
Fields,
Indices,
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 3 additions & 9 deletions specification/_global/explain/ExplainRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions specification/_global/search/SearchRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions specification/_global/update_by_query/UpdateByQueryRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import { RequestBase } from '@_types/Base'
import {
Conflicts,
DefaultOperator,
ExpandWildcards,
Fields,
Indices,
Expand All @@ -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
Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions specification/_types/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
4 changes: 2 additions & 2 deletions specification/async_search/submit/AsyncSearchSubmitRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions specification/indices/validate_query/IndicesValidateQueryRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down