Azure
/
autorest.modelerfour
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #212 from fearthecowboy/master 

Support x-ms-api-version extension
This commit is contained in:
Garrett Serack 2020-03-12 15:08:21 -07:00 коммит произвёл GitHub
Родитель dc26e1277a cf3de94a76
Коммит ffaaeade69
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 2658 добавлений и 2481 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
modelerfour/modeler/interpretations.ts
Просмотреть файл

@ -20,7 +20,8 @@ const removeKnownParameters = [
'x-ms-parameter-location', 'x-ms-parameter-location',
'x-ms-original', 'x-ms-original',
'x-ms-requestBody-name', 'x-ms-requestBody-name',
'x-ms-requestBody-index' 'x-ms-requestBody-index',
'x-ms-api-version'
]; ];
// ref: https://www.w3schools.com/charsets/ref_html_ascii.asp // ref: https://www.w3schools.com/charsets/ref_html_ascii.asp
@ -152,6 +153,9 @@ export class Interpretations {
if (parameter.in !== ParameterLocation.Query) { if (parameter.in !== ParameterLocation.Query) {
return false; return false;
} }
if (parameter['x-ms-api-version'] === false) {
return false;
}
return !!(parameter['x-ms-api-version'] || apiVersionParameterNames.find(each => each === parameter.name.toLowerCase())); return !!(parameter['x-ms-api-version'] || apiVersionParameterNames.find(each => each === parameter.name.toLowerCase()));
} }
getEnumChoices(schema: OpenAPI.Schema): Array<ChoiceValue> { getEnumChoices(schema: OpenAPI.Schema): Array<ChoiceValue> {

6
modelerfour/modeler/modelerfour.ts
Просмотреть файл

@ -1059,7 +1059,7 @@ export class ModelerFour {
const pSchema = this.processSchema(requestSchema?.name || 'requestBody', requestSchema?.instance || <OpenAPI.Schema>{}) const pSchema = this.processSchema(requestSchema?.name || 'requestBody', requestSchema?.instance || <OpenAPI.Schema>{})
// Track the usage of this schema as an input with media type // Track the usage of this schema as an input with media type
this.trackSchemaUsage(pSchema, { usage: [ SchemaContext.Input ], serializationFormats: [ kmt ] }); this.trackSchemaUsage(pSchema, { usage: [SchemaContext.Input], serializationFormats: [kmt] });
httpRequest.addParameter(new Parameter( httpRequest.addParameter(new Parameter(
body.instance?.['x-ms-requestBody-name'] ?? 'body', body.instance?.['x-ms-requestBody-name'] ?? 'body',
@ -1353,7 +1353,7 @@ export class ModelerFour {
const parameterSchema = this.processSchema(name || '', schema); const parameterSchema = this.processSchema(name || '', schema);
// Track the usage of this schema as an input with media type // Track the usage of this schema as an input with media type
this.trackSchemaUsage(parameterSchema, { usage: [ SchemaContext.Input ] }); this.trackSchemaUsage(parameterSchema, { usage: [SchemaContext.Input] });
/* regular, everyday parameter */ /* regular, everyday parameter */
const newParam = operation.addParameter(new Parameter(this.interpret.getPreferredName(parameter, schema['x-ms-client-name'] || parameter.name), this.interpret.getDescription('', parameter), parameterSchema, { const newParam = operation.addParameter(new Parameter(this.interpret.getPreferredName(parameter, schema['x-ms-client-name'] || parameter.name), this.interpret.getDescription('', parameter), parameterSchema, {
@ -1467,7 +1467,7 @@ export class ModelerFour {
} }
// Track the usage of this schema as an output with media type // Track the usage of this schema as an output with media type
this.trackSchemaUsage(s, { usage: [ SchemaContext.Output ], serializationFormats: [ knownMediaType as KnownMediaType ] }); this.trackSchemaUsage(s, { usage: [SchemaContext.Output], serializationFormats: [knownMediaType as KnownMediaType] });
const rsp = new SchemaResponse(s, { const rsp = new SchemaResponse(s, {
extensions: this.interpret.getExtensionProperties(response) extensions: this.interpret.getExtensionProperties(response)

101
modelerfour/test/scenarios/azure-special-properties/flattened.yaml
Просмотреть файл

@ -20,7 +20,7 @@ schemas: !<!Schemas>
name: number name: number
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!NumberSchema> &ref_24 - !<!NumberSchema> &ref_25
type: integer type: integer
apiVersions: apiVersions:
- !<!ApiVersion> - !<!ApiVersion>
@ -91,7 +91,17 @@ schemas: !<!Schemas>
name: ApiVersion-2015-07-01-preview name: ApiVersion-2015-07-01-preview
description: Api Version (2015-07-01-preview) description: Api Version (2015-07-01-preview)
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_19 - !<!ConstantSchema> &ref_17
type: constant
value: !<!ConstantValue>
value: '2.0'
valueType: *ref_1
language: !<!Languages>
default:
name: ''
description: ''
protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_20
type: constant type: constant
value: !<!ConstantValue> value: !<!ConstantValue>
value: path1/path2/path3 value: path1/path2/path3
@ -101,7 +111,7 @@ schemas: !<!Schemas>
name: '' name: ''
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_23 - !<!ConstantSchema> &ref_24
type: constant type: constant
value: !<!ConstantValue> value: !<!ConstantValue>
value: value1&q2=value2&q3=value3 value: value1&q2=value2&q3=value3
@ -1043,7 +1053,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- *ref_12 - !<!Parameter>
schema: *ref_17
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1139,7 +1160,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- *ref_12 - !<!Parameter>
schema: *ref_17
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1187,7 +1219,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- *ref_12 - !<!Parameter>
schema: *ref_17
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1243,7 +1286,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_17 - !<!Parameter> &ref_18
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1269,7 +1312,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_17 - *ref_18
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1305,7 +1348,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_18 - !<!Parameter> &ref_19
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1331,7 +1374,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_18 - *ref_19
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1368,7 +1411,7 @@ operationGroups:
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> - !<!Parameter>
schema: *ref_19 schema: *ref_20
implementation: Method implementation: Method
required: true required: true
extensions: extensions:
@ -1428,7 +1471,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_20 - !<!Parameter> &ref_21
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1454,7 +1497,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_20 - *ref_21
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1490,7 +1533,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_21 - !<!Parameter> &ref_22
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
extensions: extensions:
@ -1515,7 +1558,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_21 - *ref_22
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1551,7 +1594,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_22 - !<!Parameter> &ref_23
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1577,7 +1620,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_22 - *ref_23
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1614,7 +1657,7 @@ operationGroups:
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> - !<!Parameter>
schema: *ref_23 schema: *ref_24
implementation: Method implementation: Method
required: true required: true
extensions: extensions:
@ -1682,7 +1725,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_25 - !<!Parameter> &ref_26
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
@ -1693,8 +1736,8 @@ operationGroups:
protocol: !<!Protocols> protocol: !<!Protocols>
http: !<!HttpParameter> http: !<!HttpParameter>
in: query in: query
- !<!Parameter> &ref_26 - !<!Parameter> &ref_27
schema: *ref_24 schema: *ref_25
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
default: default:
@ -1704,7 +1747,7 @@ operationGroups:
protocol: !<!Protocols> protocol: !<!Protocols>
http: !<!HttpParameter> http: !<!HttpParameter>
in: query in: query
- !<!Parameter> &ref_27 - !<!Parameter> &ref_28
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
@ -1727,9 +1770,9 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_25
- *ref_26 - *ref_26
- *ref_27 - *ref_27
- *ref_28
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1775,7 +1818,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_28 - !<!Parameter> &ref_29
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1801,7 +1844,7 @@ operationGroups:
method: post method: post
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_28 - *ref_29
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1843,7 +1886,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_29 - !<!Parameter> &ref_30
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1870,7 +1913,7 @@ operationGroups:
method: post method: post
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_29 - *ref_30
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1912,7 +1955,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_8 - *ref_8
- !<!Parameter> &ref_30 - !<!Parameter> &ref_31
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1938,7 +1981,7 @@ operationGroups:
method: head method: head
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_30 - *ref_31
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>

107
modelerfour/test/scenarios/azure-special-properties/grouped.yaml
Просмотреть файл

@ -20,7 +20,7 @@ schemas: !<!Schemas>
name: number name: number
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!NumberSchema> &ref_25 - !<!NumberSchema> &ref_26
type: integer type: integer
apiVersions: apiVersions:
- !<!ApiVersion> - !<!ApiVersion>
@ -91,7 +91,17 @@ schemas: !<!Schemas>
name: ApiVersion-2015-07-01-preview name: ApiVersion-2015-07-01-preview
description: Api Version (2015-07-01-preview) description: Api Version (2015-07-01-preview)
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_20 - !<!ConstantSchema> &ref_18
type: constant
value: !<!ConstantValue>
value: '2.0'
valueType: *ref_1
language: !<!Languages>
default:
name: ''
description: ''
protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_21
type: constant type: constant
value: !<!ConstantValue> value: !<!ConstantValue>
value: path1/path2/path3 value: path1/path2/path3
@ -101,7 +111,7 @@ schemas: !<!Schemas>
name: '' name: ''
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_24 - !<!ConstantSchema> &ref_25
type: constant type: constant
value: !<!ConstantValue> value: !<!ConstantValue>
value: value1&q2=value2&q3=value3 value: value1&q2=value2&q3=value3
@ -118,9 +128,9 @@ schemas: !<!Schemas>
- !<!Property> - !<!Property>
schema: *ref_6 schema: *ref_6
originalParameter: originalParameter:
- !<!Parameter> &ref_30 - !<!Parameter> &ref_31
schema: *ref_6 schema: *ref_6
groupedBy: !<!Parameter> &ref_31 groupedBy: !<!Parameter> &ref_32
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
required: true required: true
@ -1087,7 +1097,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- *ref_13 - !<!Parameter>
schema: *ref_18
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1183,7 +1204,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- *ref_13 - !<!Parameter>
schema: *ref_18
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1231,7 +1263,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- *ref_13 - !<!Parameter>
schema: *ref_18
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1287,7 +1330,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_18 - !<!Parameter> &ref_19
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1313,7 +1356,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_18 - *ref_19
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1349,7 +1392,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_19 - !<!Parameter> &ref_20
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1375,7 +1418,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_19 - *ref_20
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1412,7 +1455,7 @@ operationGroups:
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> - !<!Parameter>
schema: *ref_20 schema: *ref_21
implementation: Method implementation: Method
required: true required: true
extensions: extensions:
@ -1472,7 +1515,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_21 - !<!Parameter> &ref_22
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1498,7 +1541,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_21 - *ref_22
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1534,7 +1577,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_22 - !<!Parameter> &ref_23
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
extensions: extensions:
@ -1559,7 +1602,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_22 - *ref_23
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1595,7 +1638,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_23 - !<!Parameter> &ref_24
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1621,7 +1664,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_23 - *ref_24
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1658,7 +1701,7 @@ operationGroups:
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> - !<!Parameter>
schema: *ref_24 schema: *ref_25
implementation: Method implementation: Method
required: true required: true
extensions: extensions:
@ -1726,7 +1769,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_26 - !<!Parameter> &ref_27
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
@ -1737,8 +1780,8 @@ operationGroups:
protocol: !<!Protocols> protocol: !<!Protocols>
http: !<!HttpParameter> http: !<!HttpParameter>
in: query in: query
- !<!Parameter> &ref_27 - !<!Parameter> &ref_28
schema: *ref_25 schema: *ref_26
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
default: default:
@ -1748,7 +1791,7 @@ operationGroups:
protocol: !<!Protocols> protocol: !<!Protocols>
http: !<!HttpParameter> http: !<!HttpParameter>
in: query in: query
- !<!Parameter> &ref_28 - !<!Parameter> &ref_29
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
@ -1771,9 +1814,9 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_26
- *ref_27 - *ref_27
- *ref_28 - *ref_28
- *ref_29
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1819,7 +1862,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_29 - !<!Parameter> &ref_30
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1845,7 +1888,7 @@ operationGroups:
method: post method: post
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_29 - *ref_30
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1887,13 +1930,13 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- *ref_30 - *ref_31
requests: requests:
- !<!Request> - !<!Request>
parameters: parameters:
- *ref_31 - *ref_32
signatureParameters: signatureParameters:
- *ref_31 - *ref_32
language: !<!Languages> language: !<!Languages>
default: default:
name: '' name: ''
@ -1945,7 +1988,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_32 - !<!Parameter> &ref_33
schema: *ref_6 schema: *ref_6
implementation: Method implementation: Method
required: true required: true
@ -1971,7 +2014,7 @@ operationGroups:
method: head method: head
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_32 - *ref_33
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>

101
modelerfour/test/scenarios/azure-special-properties/modeler.yaml
Просмотреть файл

@ -20,7 +20,7 @@ schemas: !<!Schemas>
name: number name: number
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!NumberSchema> &ref_24 - !<!NumberSchema> &ref_25
type: integer type: integer
apiVersions: apiVersions:
- !<!ApiVersion> - !<!ApiVersion>
@ -91,7 +91,17 @@ schemas: !<!Schemas>
name: ApiVersion-2015-07-01-preview name: ApiVersion-2015-07-01-preview
description: Api Version (2015-07-01-preview) description: Api Version (2015-07-01-preview)
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_19 - !<!ConstantSchema> &ref_17
type: constant
value: !<!ConstantValue>
value: '2.0'
valueType: *ref_5
language: !<!Languages>
default:
name: ''
description: ''
protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_20
type: constant type: constant
value: !<!ConstantValue> value: !<!ConstantValue>
value: path1/path2/path3 value: path1/path2/path3
@ -101,7 +111,7 @@ schemas: !<!Schemas>
name: '' name: ''
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_23 - !<!ConstantSchema> &ref_24
type: constant type: constant
value: !<!ConstantValue> value: !<!ConstantValue>
value: value1&q2=value2&q3=value3 value: value1&q2=value2&q3=value3
@ -1043,7 +1053,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- *ref_16 - !<!Parameter>
schema: *ref_17
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1139,7 +1160,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- *ref_16 - !<!Parameter>
schema: *ref_17
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1187,7 +1219,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- *ref_16 - !<!Parameter>
schema: *ref_17
implementation: Method
required: true
language: !<!Languages>
default:
name: api-version
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1243,7 +1286,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_17 - !<!Parameter> &ref_18
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
required: true required: true
@ -1269,7 +1312,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_17 - *ref_18
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1305,7 +1348,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_18 - !<!Parameter> &ref_19
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
required: true required: true
@ -1331,7 +1374,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_18 - *ref_19
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1368,7 +1411,7 @@ operationGroups:
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> - !<!Parameter>
schema: *ref_19 schema: *ref_20
implementation: Method implementation: Method
required: true required: true
extensions: extensions:
@ -1428,7 +1471,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_20 - !<!Parameter> &ref_21
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
required: true required: true
@ -1454,7 +1497,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_20 - *ref_21
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1490,7 +1533,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_21 - !<!Parameter> &ref_22
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
extensions: extensions:
@ -1515,7 +1558,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_21 - *ref_22
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1551,7 +1594,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_22 - !<!Parameter> &ref_23
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
required: true required: true
@ -1577,7 +1620,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_22 - *ref_23
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1614,7 +1657,7 @@ operationGroups:
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> - !<!Parameter>
schema: *ref_23 schema: *ref_24
implementation: Method implementation: Method
required: true required: true
extensions: extensions:
@ -1682,7 +1725,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_25 - !<!Parameter> &ref_26
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
@ -1693,8 +1736,8 @@ operationGroups:
protocol: !<!Protocols> protocol: !<!Protocols>
http: !<!HttpParameter> http: !<!HttpParameter>
in: query in: query
- !<!Parameter> &ref_26 - !<!Parameter> &ref_27
schema: *ref_24 schema: *ref_25
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
default: default:
@ -1704,7 +1747,7 @@ operationGroups:
protocol: !<!Protocols> protocol: !<!Protocols>
http: !<!HttpParameter> http: !<!HttpParameter>
in: query in: query
- !<!Parameter> &ref_27 - !<!Parameter> &ref_28
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
@ -1727,9 +1770,9 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_25
- *ref_26 - *ref_26
- *ref_27 - *ref_27
- *ref_28
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1775,7 +1818,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_28 - !<!Parameter> &ref_29
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
required: true required: true
@ -1801,7 +1844,7 @@ operationGroups:
method: post method: post
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_28 - *ref_29
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1843,7 +1886,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_29 - !<!Parameter> &ref_30
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
required: true required: true
@ -1870,7 +1913,7 @@ operationGroups:
method: post method: post
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_29 - *ref_30
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1912,7 +1955,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_6 - *ref_6
- !<!Parameter> &ref_30 - !<!Parameter> &ref_31
schema: *ref_7 schema: *ref_7
implementation: Method implementation: Method
required: true required: true
@ -1938,7 +1981,7 @@ operationGroups:
method: head method: head
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_30 - *ref_31
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>

111
modelerfour/test/scenarios/azure-special-properties/namer.yaml
Просмотреть файл

@ -20,7 +20,7 @@ schemas: !<!Schemas>
name: Number name: Number
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!NumberSchema> &ref_25 - !<!NumberSchema> &ref_26
type: integer type: integer
apiVersions: apiVersions:
- !<!ApiVersion> - !<!ApiVersion>
@ -91,24 +91,34 @@ schemas: !<!Schemas>
name: ApiVersion20150701Preview name: ApiVersion20150701Preview
description: Api Version (2015-07-01-preview) description: Api Version (2015-07-01-preview)
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_20 - !<!ConstantSchema> &ref_18
type: constant type: constant
value: !<!ConstantValue> value: !<!ConstantValue>
value: path1/path2/path3 value: '2.0'
valueType: *ref_1 valueType: *ref_1
language: !<!Languages> language: !<!Languages>
default: default:
name: Constant2 name: Constant2
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_24 - !<!ConstantSchema> &ref_21
type: constant
value: !<!ConstantValue>
value: path1/path2/path3
valueType: *ref_1
language: !<!Languages>
default:
name: Constant3
description: ''
protocol: !<!Protocols> {}
- !<!ConstantSchema> &ref_25
type: constant type: constant
value: !<!ConstantValue> value: !<!ConstantValue>
value: value1&q2=value2&q3=value3 value: value1&q2=value2&q3=value3
valueType: *ref_1 valueType: *ref_1
language: !<!Languages> language: !<!Languages>
default: default:
name: Constant3 name: Constant4
description: '' description: ''
protocol: !<!Protocols> {} protocol: !<!Protocols> {}
groups: groups:
@ -118,9 +128,9 @@ schemas: !<!Schemas>
- !<!Property> - !<!Property>
schema: *ref_2 schema: *ref_2
originalParameter: originalParameter:
- !<!Parameter> &ref_30 - !<!Parameter> &ref_31
schema: *ref_2 schema: *ref_2
groupedBy: !<!Parameter> &ref_31 groupedBy: !<!Parameter> &ref_32
schema: *ref_3 schema: *ref_3
implementation: Method implementation: Method
required: true required: true
@ -1087,7 +1097,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- *ref_13 - !<!Parameter>
schema: *ref_18
implementation: Method
required: true
language: !<!Languages>
default:
name: ApiVersion
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1183,7 +1204,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- *ref_13 - !<!Parameter>
schema: *ref_18
implementation: Method
required: true
language: !<!Languages>
default:
name: ApiVersion
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1231,7 +1263,18 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- *ref_13 - !<!Parameter>
schema: *ref_18
implementation: Method
required: true
language: !<!Languages>
default:
name: ApiVersion
description: 'This should appear as a method parameter, use value ''2.0'''
serializedName: api-version
protocol: !<!Protocols>
http: !<!HttpParameter>
in: query
requests: requests:
- !<!Request> - !<!Request>
language: !<!Languages> language: !<!Languages>
@ -1287,7 +1330,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_18 - !<!Parameter> &ref_19
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
required: true required: true
@ -1313,7 +1356,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_18 - *ref_19
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1349,7 +1392,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_19 - !<!Parameter> &ref_20
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
required: true required: true
@ -1375,7 +1418,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_19 - *ref_20
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1412,7 +1455,7 @@ operationGroups:
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> - !<!Parameter>
schema: *ref_20 schema: *ref_21
implementation: Method implementation: Method
required: true required: true
extensions: extensions:
@ -1472,7 +1515,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_21 - !<!Parameter> &ref_22
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
required: true required: true
@ -1498,7 +1541,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_21 - *ref_22
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1534,7 +1577,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_22 - !<!Parameter> &ref_23
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
extensions: extensions:
@ -1559,7 +1602,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_22 - *ref_23
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1595,7 +1638,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_23 - !<!Parameter> &ref_24
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
required: true required: true
@ -1621,7 +1664,7 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_23 - *ref_24
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1658,7 +1701,7 @@ operationGroups:
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> - !<!Parameter>
schema: *ref_24 schema: *ref_25
implementation: Method implementation: Method
required: true required: true
extensions: extensions:
@ -1726,7 +1769,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_26 - !<!Parameter> &ref_27
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
@ -1737,8 +1780,8 @@ operationGroups:
protocol: !<!Protocols> protocol: !<!Protocols>
http: !<!HttpParameter> http: !<!HttpParameter>
in: query in: query
- !<!Parameter> &ref_27 - !<!Parameter> &ref_28
schema: *ref_25 schema: *ref_26
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
default: default:
@ -1748,7 +1791,7 @@ operationGroups:
protocol: !<!Protocols> protocol: !<!Protocols>
http: !<!HttpParameter> http: !<!HttpParameter>
in: query in: query
- !<!Parameter> &ref_28 - !<!Parameter> &ref_29
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
language: !<!Languages> language: !<!Languages>
@ -1771,9 +1814,9 @@ operationGroups:
method: get method: get
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_26
- *ref_27 - *ref_27
- *ref_28 - *ref_28
- *ref_29
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1819,7 +1862,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_29 - !<!Parameter> &ref_30
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
required: true required: true
@ -1845,7 +1888,7 @@ operationGroups:
method: post method: post
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_29 - *ref_30
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>
@ -1887,13 +1930,13 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- *ref_30 - *ref_31
requests: requests:
- !<!Request> - !<!Request>
parameters: parameters:
- *ref_31 - *ref_32
signatureParameters: signatureParameters:
- *ref_31 - *ref_32
language: !<!Languages> language: !<!Languages>
default: default:
name: '' name: ''
@ -1945,7 +1988,7 @@ operationGroups:
version: 2015-07-01-preview version: 2015-07-01-preview
parameters: parameters:
- *ref_9 - *ref_9
- !<!Parameter> &ref_32 - !<!Parameter> &ref_33
schema: *ref_2 schema: *ref_2
implementation: Method implementation: Method
required: true required: true
@ -1971,7 +2014,7 @@ operationGroups:
method: head method: head
uri: '{$host}' uri: '{$host}'
signatureParameters: signatureParameters:
- *ref_32 - *ref_33
responses: responses:
- !<!Response> - !<!Response>
language: !<!Languages> language: !<!Languages>

4707
modelerfour/test/scenarios/azure-special-properties/openapi-document.json
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу