Skip to content

Commit b04ef39

Browse files
giakasgiakas
committed
Move ApiError and ODataError to a different file, as autorest v3 is complaining about duplicate
1 parent 51f7b85 commit b04ef39

File tree

9 files changed

+139
-328
lines changed

9 files changed

+139
-328
lines changed

‎specification/mediaservices/resource-manager/Microsoft.Media/stable/2020-05-01/AccountFilters.json‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -207,41 +207,6 @@
207207
"type": "object",
208208
"description": "An Account Filter."
209209
},
210-
"ODataError": {
211-
"properties": {
212-
"code": {
213-
"type": "string",
214-
"description": "A language-independent error name."
215-
},
216-
"message": {
217-
"type": "string",
218-
"description": "The error message."
219-
},
220-
"target": {
221-
"type": "string",
222-
"description": "The target of the error (for example, the name of the property in error)."
223-
},
224-
"details": {
225-
"type": "array",
226-
"items": {
227-
"$ref": "#/definitions/ODataError"
228-
},
229-
"description": "The error details."
230-
}
231-
},
232-
"type": "object",
233-
"description": "Information about an error."
234-
},
235-
"ApiError": {
236-
"properties": {
237-
"error": {
238-
"$ref": "#/definitions/ODataError",
239-
"description": "The error properties."
240-
}
241-
},
242-
"type": "object",
243-
"description": "The API error."
244-
},
245210
"AccountFilterCollection": {
246211
"properties": {
247212
"value": {
@@ -276,7 +241,7 @@
276241
"default": {
277242
"description": "Detailed error information.",
278243
"schema": {
279-
"$ref": "#/definitions/ApiError"
244+
"$ref": "./Common.json#/definitions/ApiError"
280245
}
281246
}
282247
},
@@ -322,7 +287,7 @@
322287
"default": {
323288
"description": "Detailed error information.",
324289
"schema": {
325-
"$ref": "#/definitions/ApiError"
290+
"$ref": "./Common.json#/definitions/ApiError"
326291
}
327292
}
328293
},
@@ -373,7 +338,7 @@
373338
"default": {
374339
"description": "Detailed error information.",
375340
"schema": {
376-
"$ref": "#/definitions/ApiError"
341+
"$ref": "./Common.json#/definitions/ApiError"
377342
}
378343
}
379344
},
@@ -427,7 +392,7 @@
427392
"default": {
428393
"description": "Detailed error information.",
429394
"schema": {
430-
"$ref": "#/definitions/ApiError"
395+
"$ref": "./Common.json#/definitions/ApiError"
431396
}
432397
}
433398
},
@@ -472,7 +437,7 @@
472437
"default": {
473438
"description": "Detailed error information.",
474439
"schema": {
475-
"$ref": "#/definitions/ApiError"
440+
"$ref": "./Common.json#/definitions/ApiError"
476441
}
477442
}
478443
},

‎specification/mediaservices/resource-manager/Microsoft.Media/stable/2020-05-01/Accounts.json‎

Lines changed: 17 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -543,41 +543,6 @@
543543
"type"
544544
]
545545
},
546-
"ODataError": {
547-
"properties": {
548-
"code": {
549-
"type": "string",
550-
"description": "A language-independent error name."
551-
},
552-
"message": {
553-
"type": "string",
554-
"description": "The error message."
555-
},
556-
"target": {
557-
"type": "string",
558-
"description": "The target of the error (for example, the name of the property in error)."
559-
},
560-
"details": {
561-
"type": "array",
562-
"items": {
563-
"$ref": "#/definitions/ODataError"
564-
},
565-
"description": "The error details."
566-
}
567-
},
568-
"type": "object",
569-
"description": "Information about an error."
570-
},
571-
"ApiError": {
572-
"properties": {
573-
"error": {
574-
"$ref": "#/definitions/ODataError",
575-
"description": "The error properties."
576-
}
577-
},
578-
"type": "object",
579-
"description": "The API error."
580-
},
581546
"OperationCollection": {
582547
"properties": {
583548
"value": {
@@ -643,7 +608,7 @@
643608
"default": {
644609
"description": "Detailed error information.",
645610
"schema": {
646-
"$ref": "#/definitions/ApiError"
611+
"$ref": "./Common.json#/definitions/ApiError"
647612
}
648613
}
649614
},
@@ -677,7 +642,7 @@
677642
"default": {
678643
"description": "Detailed error information.",
679644
"schema": {
680-
"$ref": "#/definitions/ApiError"
645+
"$ref": "./Common.json#/definitions/ApiError"
681646
}
682647
}
683648
},
@@ -717,7 +682,7 @@
717682
"default": {
718683
"description": "Detailed error information.",
719684
"schema": {
720-
"$ref": "#/definitions/ApiError"
685+
"$ref": "./Common.json#/definitions/ApiError"
721686
}
722687
}
723688
},
@@ -765,7 +730,7 @@
765730
"default": {
766731
"description": "Detailed error information.",
767732
"schema": {
768-
"$ref": "#/definitions/ApiError"
733+
"$ref": "./Common.json#/definitions/ApiError"
769734
}
770735
}
771736
},
@@ -816,7 +781,7 @@
816781
"default": {
817782
"description": "Detailed error information.",
818783
"schema": {
819-
"$ref": "#/definitions/ApiError"
784+
"$ref": "./Common.json#/definitions/ApiError"
820785
}
821786
}
822787
},
@@ -858,7 +823,7 @@
858823
"default": {
859824
"description": "Detailed error information.",
860825
"schema": {
861-
"$ref": "#/definitions/ApiError"
826+
"$ref": "./Common.json#/definitions/ApiError"
862827
}
863828
}
864829
},
@@ -908,7 +873,7 @@
908873
"default": {
909874
"description": "Detailed error information.",
910875
"schema": {
911-
"$ref": "#/definitions/ApiError"
876+
"$ref": "./Common.json#/definitions/ApiError"
912877
}
913878
}
914879
},
@@ -961,7 +926,7 @@
961926
"default": {
962927
"description": "Detailed error information.",
963928
"schema": {
964-
"$ref": "#/definitions/ApiError"
929+
"$ref": "./Common.json#/definitions/ApiError"
965930
}
966931
}
967932
},
@@ -1014,7 +979,7 @@
1014979
"default": {
1015980
"description": "Detailed error information.",
1016981
"schema": {
1017-
"$ref": "#/definitions/ApiError"
982+
"$ref": "./Common.json#/definitions/ApiError"
1018983
}
1019984
}
1020985
},
@@ -1058,7 +1023,7 @@
10581023
"default": {
10591024
"description": "Detailed error information.",
10601025
"schema": {
1061-
"$ref": "#/definitions/ApiError"
1026+
"$ref": "./Common.json#/definitions/ApiError"
10621027
}
10631028
}
10641029
},
@@ -1108,7 +1073,7 @@
11081073
"default": {
11091074
"description": "Detailed error information.",
11101075
"schema": {
1111-
"$ref": "#/definitions/ApiError"
1076+
"$ref": "./Common.json#/definitions/ApiError"
11121077
}
11131078
}
11141079
},
@@ -1152,7 +1117,7 @@
11521117
"default": {
11531118
"description": "Detailed error information.",
11541119
"schema": {
1155-
"$ref": "#/definitions/ApiError"
1120+
"$ref": "./Common.json#/definitions/ApiError"
11561121
}
11571122
}
11581123
},
@@ -1200,7 +1165,7 @@
12001165
"default": {
12011166
"description": "Detailed error information.",
12021167
"schema": {
1203-
"$ref": "#/definitions/ApiError"
1168+
"$ref": "./Common.json#/definitions/ApiError"
12041169
}
12051170
}
12061171
},
@@ -1254,7 +1219,7 @@
12541219
"default": {
12551220
"description": "Detailed error information.",
12561221
"schema": {
1257-
"$ref": "#/definitions/ApiError"
1222+
"$ref": "./Common.json#/definitions/ApiError"
12581223
}
12591224
}
12601225
},
@@ -1304,7 +1269,7 @@
13041269
"default": {
13051270
"description": "Detailed error information.",
13061271
"schema": {
1307-
"$ref": "#/definitions/ApiError"
1272+
"$ref": "./Common.json#/definitions/ApiError"
13081273
}
13091274
}
13101275
},
@@ -1354,7 +1319,7 @@
13541319
"default": {
13551320
"description": "Detailed error information.",
13561321
"schema": {
1357-
"$ref": "#/definitions/ApiError"
1322+
"$ref": "./Common.json#/definitions/ApiError"
13581323
}
13591324
}
13601325
},
@@ -1391,7 +1356,7 @@
13911356
"default": {
13921357
"description": "Detailed error information.",
13931358
"schema": {
1394-
"$ref": "#/definitions/ApiError"
1359+
"$ref": "./Common.json#/definitions/ApiError"
13951360
}
13961361
}
13971362
},

0 commit comments

Comments
 (0)