Skip to content

Commit 8253d67

Browse files
MaggieKimani1MaggieKimani1
authored
Merge pull request #693 from microsoft/feat/upgrade-oai.net
feat: upgrades OpenApi.NET to preview22
2 parents 0b0514f + 39fde17 commit 8253d67

File tree

170 files changed

+743
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+743
-969
lines changed

‎.redocly.lint-ignore.yaml‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
# This file instructs Redocly's linter to ignore the rules contained for specific parts of your API.
2+
# Suppresses the error "The 'type' field must be defined when the 'nullable' field is used" per this comment https://github.com/Redocly/redocly-cli/issues/925#issuecomment-2355005587.
3+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.json:
4+
no-server-example.com:
5+
- '#/servers/0/url'
6+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.json:
7+
no-server-example.com:
8+
- '#/servers/0/url'
9+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.json:
10+
no-server-example.com:
11+
- '#/servers/0/url'
12+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.json:
13+
no-server-example.com:
14+
- '#/servers/0/url'
15+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.json:
16+
no-server-example.com:
17+
- '#/servers/0/url'
18+
struct:
19+
- >-
20+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.DocumentClass/properties/Document/anyOf/1/nullable
21+
- >-
22+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.DocumentTagRel/properties/Document/anyOf/1/nullable
23+
- >-
24+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.DocumentTagRel/properties/Tag/anyOf/1/nullable
25+
- >-
26+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library/properties/LibraryParent/anyOf/1/nullable
27+
- >-
28+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType/properties/MasterLibraryType/anyOf/1/nullable
29+
- >-
30+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType/properties/ParentLibraryTypes/anyOf/1/nullable
31+
- >-
32+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library/properties/Type/anyOf/1/nullable
33+
- >-
34+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library/properties/SourceFolder/anyOf/1/nullable
35+
- >-
36+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document/properties/Library/anyOf/1/nullable
37+
- >-
38+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document/properties/LastRevisionFile/anyOf/1/nullable
39+
- >-
40+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document/properties/SourceDocument/anyOf/1/nullable
41+
- >-
42+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Revision.Revision/properties/Document/anyOf/1/nullable
43+
- >-
44+
#/components/schemas/Siterra.Documents.App.DTO.RevisionDto/properties/Document/anyOf/1/nullable
45+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.json:
46+
no-server-example.com:
47+
- '#/servers/0/url'
48+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json:
49+
struct:
50+
- >-
51+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Location/properties/City/anyOf/1/nullable
52+
- >-
53+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person/properties/HomeAddress/anyOf/1/nullable
54+
- >-
55+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person/properties/BestFriend/anyOf/1/nullable
56+
- >-
57+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.AirportLocation/allOf/1/properties/EmergencyAuthority/anyOf/1/nullable
58+
- >-
59+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Airport/properties/Location/anyOf/1/nullable
60+
- >-
61+
#/paths/~1GetNearestAirport(lat={lat},lon={lon})/get/responses/200/content/application~1json/schema/anyOf/1/nullable
62+
- >-
63+
#/paths/~1GetPersonWithMostFriends()/get/responses/200/content/application~1json/schema/anyOf/1/nullable
64+
- >-
65+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Manager/allOf/1/properties/BossOffice/anyOf/1/nullable
66+
- >-
67+
#/components/responses/GetFavoriteAirlineResponse/content/application~1json/schema/anyOf/1/nullable
68+
- >-
69+
#/paths/~1Me~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Manager~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Hire/post/requestBody/content/application~1json/schema/properties/hire/anyOf/1/nullable
70+
- >-
71+
#/paths/~1NewComePeople~1{UserName}~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Manager~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Hire/post/requestBody/content/application~1json/schema/properties/hire/anyOf/1/nullable
72+
- >-
73+
#/paths/~1People~1{UserName}~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Manager~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Hire/post/requestBody/content/application~1json/schema/properties/hire/anyOf/1/nullable
74+
- >-
75+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Event/allOf/1/properties/OccursAt/anyOf/1/nullable
76+
- >-
77+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Flight/allOf/1/properties/Airline/anyOf/1/nullable
78+
- >-
79+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Flight/allOf/1/properties/From/anyOf/1/nullable
80+
- >-
81+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Flight/allOf/1/properties/To/anyOf/1/nullable
82+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.yaml:
83+
no-server-example.com:
84+
- '#/servers/0/url'
85+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.yaml:
86+
no-server-example.com:
87+
- '#/servers/0/url'
88+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.yaml:
89+
no-server-example.com:
90+
- '#/servers/0/url'
91+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.yaml:
92+
no-server-example.com:
93+
- '#/servers/0/url'
94+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.yaml:
95+
no-server-example.com:
96+
- '#/servers/0/url'
97+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.yaml:
98+
no-server-example.com:
99+
- '#/servers/0/url'
100+
struct:
101+
- >-
102+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.DocumentClass/properties/Document/anyOf/1/nullable
103+
- >-
104+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.DocumentTagRel/properties/Document/anyOf/1/nullable
105+
- >-
106+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.DocumentTagRel/properties/Tag/anyOf/1/nullable
107+
- >-
108+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library/properties/LibraryParent/anyOf/1/nullable
109+
- >-
110+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType/properties/MasterLibraryType/anyOf/1/nullable
111+
- >-
112+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.LibraryType/properties/ParentLibraryTypes/anyOf/1/nullable
113+
- >-
114+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library/properties/Type/anyOf/1/nullable
115+
- >-
116+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Library.Library/properties/SourceFolder/anyOf/1/nullable
117+
- >-
118+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document/properties/Library/anyOf/1/nullable
119+
- >-
120+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document/properties/LastRevisionFile/anyOf/1/nullable
121+
- >-
122+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Document.Document/properties/SourceDocument/anyOf/1/nullable
123+
- >-
124+
#/components/schemas/Siterra.Documents.BusinessLogic.Entities.Revision.Revision/properties/Document/anyOf/1/nullable
125+
- >-
126+
#/components/schemas/Siterra.Documents.App.DTO.RevisionDto/properties/Document/anyOf/1/nullable
127+
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml:
128+
struct:
129+
- >-
130+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Location/properties/City/anyOf/1/nullable
131+
- >-
132+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person/properties/HomeAddress/anyOf/1/nullable
133+
- >-
134+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person/properties/BestFriend/anyOf/1/nullable
135+
- >-
136+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.AirportLocation/allOf/1/properties/EmergencyAuthority/anyOf/1/nullable
137+
- >-
138+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Airport/properties/Location/anyOf/1/nullable
139+
- >-
140+
#/paths/~1GetNearestAirport(lat={lat},lon={lon})/get/responses/200/content/application~1json/schema/anyOf/1/nullable
141+
- >-
142+
#/paths/~1GetPersonWithMostFriends()/get/responses/200/content/application~1json/schema/anyOf/1/nullable
143+
- >-
144+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Manager/allOf/1/properties/BossOffice/anyOf/1/nullable
145+
- >-
146+
#/components/responses/GetFavoriteAirlineResponse/content/application~1json/schema/anyOf/1/nullable
147+
- >-
148+
#/paths/~1Me~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Manager~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Hire/post/requestBody/content/application~1json/schema/properties/hire/anyOf/1/nullable
149+
- >-
150+
#/paths/~1NewComePeople~1{UserName}~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Manager~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Hire/post/requestBody/content/application~1json/schema/properties/hire/anyOf/1/nullable
151+
- >-
152+
#/paths/~1People~1{UserName}~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Manager~1Microsoft.OData.Service.Sample.TrippinInMemory.Models.Hire/post/requestBody/content/application~1json/schema/properties/hire/anyOf/1/nullable
153+
- >-
154+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Event/allOf/1/properties/OccursAt/anyOf/1/nullable
155+
- >-
156+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Flight/allOf/1/properties/Airline/anyOf/1/nullable
157+
- >-
158+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Flight/allOf/1/properties/From/anyOf/1/nullable
159+
- >-
160+
#/components/schemas/Microsoft.OData.Service.Sample.TrippinInMemory.Models.Flight/allOf/1/properties/To/anyOf/1/nullable

‎src/Microsoft.OpenApi.OData.Reader/Common/EdmModelHelper.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
using Microsoft.OData.Edm;
1010
using Microsoft.OData.Edm.Csdl;
1111
using Microsoft.OData.Edm.Vocabularies;
12-
using Microsoft.OpenApi.Models;
13-
using Microsoft.OpenApi.Models.Interfaces;
14-
using Microsoft.OpenApi.Models.References;
1512
using Microsoft.OpenApi.OData.Edm;
1613
using Microsoft.OpenApi.OData.Vocabulary.Capabilities;
1714

‎src/Microsoft.OpenApi.OData.Reader/Common/OpenApiOperationExtensions.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
44
// ------------------------------------------------------------
55

6-
using Microsoft.OpenApi.Models;
7-
using Microsoft.OpenApi.Models.Interfaces;
86
using Microsoft.OpenApi.OData.Generator;
97
using System.Collections.Generic;
108

‎src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
using System.Linq;
1010
using Microsoft.OData.Edm;
1111
using Microsoft.OData.Edm.Vocabularies;
12-
using Microsoft.OpenApi.Extensions;
13-
using Microsoft.OpenApi.Interfaces;
14-
using Microsoft.OpenApi.Models;
15-
using Microsoft.OpenApi.Models.Interfaces;
1612
using Microsoft.OpenApi.OData.Edm;
1713
using Microsoft.OpenApi.OData.Vocabulary;
1814

‎src/Microsoft.OpenApi.OData.Reader/Edm/ODataContext.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
using System.Linq;
99
using Microsoft.OData.Edm;
1010
using Microsoft.OData.Edm.Vocabularies;
11-
using Microsoft.OpenApi.Extensions;
12-
using Microsoft.OpenApi.Interfaces;
13-
using Microsoft.OpenApi.Models;
1411
using Microsoft.OpenApi.OData.Common;
1512
using Microsoft.OpenApi.OData.Generator;
1613
using Microsoft.OpenApi.OData.Operation;

‎src/Microsoft.OpenApi.OData.Reader/EdmModelOpenApiExtensions.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
using System.Collections.Generic;
77
using Microsoft.OData.Edm;
88
using Microsoft.OData.Edm.Validation;
9-
using Microsoft.OpenApi.Extensions;
10-
using Microsoft.OpenApi.Interfaces;
11-
using Microsoft.OpenApi.Models;
129
using Microsoft.OpenApi.OData.Common;
1310
using Microsoft.OpenApi.OData.Edm;
1411
using Microsoft.OpenApi.OData.Generator;

‎src/Microsoft.OpenApi.OData.Reader/Extensions/IODataRoutePathPrefixProvider.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// ------------------------------------------------------------
55

66
using System.Collections.Generic;
7-
using Microsoft.OpenApi.Models;
87

98
namespace Microsoft.OpenApi.OData.Extensions
109
{

‎src/Microsoft.OpenApi.OData.Reader/Extensions/ODataRoutePathPrefixProvider.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// ------------------------------------------------------------
55

66
using System.Collections.Generic;
7-
using Microsoft.OpenApi.Models;
87

98
namespace Microsoft.OpenApi.OData.Extensions
109
{

‎src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiComponentsGenerator.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
44
// ------------------------------------------------------------
55

6-
using Microsoft.OpenApi.Models;
76
using Microsoft.OpenApi.OData.Common;
87
using Microsoft.OpenApi.OData.Edm;
98

‎src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiDocumentGenerator.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
44
// ------------------------------------------------------------
55

6-
using Microsoft.OpenApi.Models;
76
using Microsoft.OpenApi.OData.Common;
87
using Microsoft.OpenApi.OData.Edm;
98

0 commit comments

Comments
 (0)