Skip to content

Commit 54a8b37

Browse files
l-trottal-trotta
authored
simplifying generics (#2665)
1 parent 10ce7ad commit 54a8b37

File tree

6 files changed

+52
-122
lines changed

6 files changed

+52
-122
lines changed

‎output/openapi/elasticsearch-openapi.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57817,14 +57817,14 @@
5781757817
"_types.query_dsl:UntypedDecayFunction": {
5781857818
"allOf": [
5781957819
{
57820-
"$ref": "#/components/schemas/_types.query_dsl:DecayFunctionBaseField"
57820+
"$ref": "#/components/schemas/_types.query_dsl:DecayFunctionBase"
5782157821
},
5782257822
{
5782357823
"type": "object"
5782457824
}
5782557825
]
5782657826
},
57827-
"_types.query_dsl:DecayFunctionBaseField": {
57827+
"_types.query_dsl:DecayFunctionBase": {
5782857828
"type": "object",
5782957829
"properties": {
5783057830
"multi_value_mode": {
@@ -57844,14 +57844,14 @@
5784457844
"_types.query_dsl:DateDecayFunction": {
5784557845
"allOf": [
5784657846
{
57847-
"$ref": "#/components/schemas/_types.query_dsl:DecayFunctionBaseFieldDecayPlacementDateMathDuration"
57847+
"$ref": "#/components/schemas/_types.query_dsl:DecayFunctionBaseDecayPlacementDateMathDuration"
5784857848
},
5784957849
{
5785057850
"type": "object"
5785157851
}
5785257852
]
5785357853
},
57854-
"_types.query_dsl:DecayFunctionBaseFieldDecayPlacementDateMathDuration": {
57854+
"_types.query_dsl:DecayFunctionBaseDecayPlacementDateMathDuration": {
5785557855
"type": "object",
5785657856
"properties": {
5785757857
"multi_value_mode": {
@@ -57862,14 +57862,14 @@
5786257862
"_types.query_dsl:NumericDecayFunction": {
5786357863
"allOf": [
5786457864
{
57865-
"$ref": "#/components/schemas/_types.query_dsl:DecayFunctionBaseFieldDecayPlacementdoubledouble"
57865+
"$ref": "#/components/schemas/_types.query_dsl:DecayFunctionBaseDecayPlacementdoubledouble"
5786657866
},
5786757867
{
5786857868
"type": "object"
5786957869
}
5787057870
]
5787157871
},
57872-
"_types.query_dsl:DecayFunctionBaseFieldDecayPlacementdoubledouble": {
57872+
"_types.query_dsl:DecayFunctionBaseDecayPlacementdoubledouble": {
5787357873
"type": "object",
5787457874
"properties": {
5787557875
"multi_value_mode": {
@@ -57880,14 +57880,14 @@
5788057880
"_types.query_dsl:GeoDecayFunction": {
5788157881
"allOf": [
5788257882
{
57883-
"$ref": "#/components/schemas/_types.query_dsl:DecayFunctionBaseFieldDecayPlacementGeoLocationDistance"
57883+
"$ref": "#/components/schemas/_types.query_dsl:DecayFunctionBaseDecayPlacementGeoLocationDistance"
5788457884
},
5788557885
{
5788657886
"type": "object"
5788757887
}
5788857888
]
5788957889
},
57890-
"_types.query_dsl:DecayFunctionBaseFieldDecayPlacementGeoLocationDistance": {
57890+
"_types.query_dsl:DecayFunctionBaseDecayPlacementGeoLocationDistance": {
5789157891
"type": "object",
5789257892
"properties": {
5789357893
"multi_value_mode": {

‎output/openapi/elasticsearch-serverless-openapi.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎output/schema/schema-serverless.json

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -49902,7 +49902,7 @@
4990249902
"name": "FunctionBoostMode",
4990349903
"namespace": "_types.query_dsl"
4990449904
},
49905-
"specLocation": "_types/query_dsl/compound.ts#L285-L311"
49905+
"specLocation": "_types/query_dsl/compound.ts#L279-L305"
4990649906
},
4990749907
{
4990849908
"esQuirk": "this container is valid without a variant. Despite being documented as a function, 'weight'\nis actually a container property that can be combined with a function. Comment in the ES code\n(SearchModule#registerScoreFunctions) says: Weight doesn't have its own parser, so every function\nsupports it out of the box. Can be a single function too when not associated to any other function,\nwhich is why it needs to be registered manually here.",
@@ -50009,7 +50009,7 @@
5000950009
}
5001050010
}
5001150011
],
50012-
"specLocation": "_types/query_dsl/compound.ts#L216-L256",
50012+
"specLocation": "_types/query_dsl/compound.ts#L210-L250",
5001350013
"variants": {
5001450014
"kind": "container"
5001550015
}
@@ -50026,7 +50026,7 @@
5002650026
"name": "DecayFunction",
5002750027
"namespace": "_types.query_dsl"
5002850028
},
50029-
"specLocation": "_types/query_dsl/compound.ts#L205-L214",
50029+
"specLocation": "_types/query_dsl/compound.ts#L199-L208",
5003050030
"type": {
5003150031
"items": [
5003250032
{
@@ -50074,13 +50074,6 @@
5007450074
],
5007550075
"inherits": {
5007650076
"generics": [
50077-
{
50078-
"kind": "instance_of",
50079-
"type": {
50080-
"name": "Field",
50081-
"namespace": "_types"
50082-
}
50083-
},
5008450077
{
5008550078
"kind": "user_defined_value"
5008650079
}
@@ -50096,7 +50089,7 @@
5009650089
"namespace": "_types.query_dsl"
5009750090
},
5009850091
"properties": [],
50099-
"specLocation": "_types/query_dsl/compound.ts#L188-L191"
50092+
"specLocation": "_types/query_dsl/compound.ts#L188-L188"
5010050093
},
5010150094
{
5010250095
"attachedBehaviors": [
@@ -50108,14 +50101,14 @@
5010850101
{
5010950102
"kind": "instance_of",
5011050103
"type": {
50111-
"name": "TOrigin",
50112-
"namespace": "_types.query_dsl.DecayFunctionBase"
50104+
"name": "Field",
50105+
"namespace": "_types"
5011350106
}
5011450107
},
5011550108
{
5011650109
"kind": "instance_of",
5011750110
"type": {
50118-
"name": "TScale",
50111+
"name": "TPlacement",
5011950112
"namespace": "_types.query_dsl.DecayFunctionBase"
5012050113
}
5012150114
}
@@ -50132,11 +50125,7 @@
5013250125
],
5013350126
"generics": [
5013450127
{
50135-
"name": "TOrigin",
50136-
"namespace": "_types.query_dsl.DecayFunctionBase"
50137-
},
50138-
{
50139-
"name": "TScale",
50128+
"name": "TPlacement",
5014050129
"namespace": "_types.query_dsl.DecayFunctionBase"
5014150130
}
5014250131
],
@@ -50206,21 +50195,14 @@
5020650195
"name": "MultiValueMode",
5020750196
"namespace": "_types.query_dsl"
5020850197
},
50209-
"specLocation": "_types/query_dsl/compound.ts#L358-L375"
50198+
"specLocation": "_types/query_dsl/compound.ts#L352-L369"
5021050199
},
5021150200
{
5021250201
"attachedBehaviors": [
5021350202
"AdditionalProperty"
5021450203
],
5021550204
"inherits": {
5021650205
"generics": [
50217-
{
50218-
"kind": "instance_of",
50219-
"type": {
50220-
"name": "Field",
50221-
"namespace": "_types"
50222-
}
50223-
},
5022450206
{
5022550207
"generics": [
5022650208
{
@@ -50256,21 +50238,14 @@
5025650238
"namespace": "_types.query_dsl"
5025750239
},
5025850240
"properties": [],
50259-
"specLocation": "_types/query_dsl/compound.ts#L196-L199"
50241+
"specLocation": "_types/query_dsl/compound.ts#L192-L194"
5026050242
},
5026150243
{
5026250244
"attachedBehaviors": [
5026350245
"AdditionalProperty"
5026450246
],
5026550247
"inherits": {
5026650248
"generics": [
50267-
{
50268-
"kind": "instance_of",
50269-
"type": {
50270-
"name": "Field",
50271-
"namespace": "_types"
50272-
}
50273-
},
5027450249
{
5027550250
"generics": [
5027650251
{
@@ -50306,21 +50281,14 @@
5030650281
"namespace": "_types.query_dsl"
5030750282
},
5030850283
"properties": [],
50309-
"specLocation": "_types/query_dsl/compound.ts#L192-L195"
50284+
"specLocation": "_types/query_dsl/compound.ts#L189-L191"
5031050285
},
5031150286
{
5031250287
"attachedBehaviors": [
5031350288
"AdditionalProperty"
5031450289
],
5031550290
"inherits": {
5031650291
"generics": [
50317-
{
50318-
"kind": "instance_of",
50319-
"type": {
50320-
"name": "Field",
50321-
"namespace": "_types"
50322-
}
50323-
},
5032450292
{
5032550293
"generics": [
5032650294
{
@@ -50356,7 +50324,7 @@
5035650324
"namespace": "_types.query_dsl"
5035750325
},
5035850326
"properties": [],
50359-
"specLocation": "_types/query_dsl/compound.ts#L200-L203"
50327+
"specLocation": "_types/query_dsl/compound.ts#L195-L197"
5036050328
},
5036150329
{
5036250330
"kind": "interface",
@@ -50465,7 +50433,7 @@
5046550433
"name": "FieldValueFactorModifier",
5046650434
"namespace": "_types.query_dsl"
5046750435
},
50468-
"specLocation": "_types/query_dsl/compound.ts#L313-L356"
50436+
"specLocation": "_types/query_dsl/compound.ts#L307-L350"
5046950437
},
5047050438
{
5047150439
"kind": "interface",
@@ -50744,7 +50712,7 @@
5074450712
"name": "FunctionScoreMode",
5074550713
"namespace": "_types.query_dsl"
5074650714
},
50747-
"specLocation": "_types/query_dsl/compound.ts#L258-L283"
50715+
"specLocation": "_types/query_dsl/compound.ts#L252-L277"
5074850716
},
5074950717
{
5075050718
"inherits": {

0 commit comments

Comments
 (0)