Skip to content

Commit 957ca8d

Browse files
MaggieKimani1MaggieKimani1
committed
Remove the static load methods from the models to prevent expanding the API surface; cleanup tests
1 parent 242428a commit 957ca8d

38 files changed

+65
-1777
lines changed

‎src/Microsoft.OpenApi/Models/OpenApiCallback.cs

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -188,74 +188,6 @@ public void SerializeAsV2(IOpenApiWriter writer)
188188
public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
189189
{
190190
// Callback object does not exist in V2.
191-
}
192-
193-
/// <summary>
194-
/// Parses a local file path or Url into an Open API document.
195-
/// </summary>
196-
/// <param name="url"> The path to the OpenAPI file.</param>
197-
/// <param name="version">The OpenAPI specification version.</param>
198-
/// <param name="diagnostic"></param>
199-
/// <param name="settings"></param>
200-
/// <returns></returns>
201-
public static OpenApiCallback Load(string url, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings settings = null)
202-
{
203-
return OpenApiModelFactory.Load<OpenApiCallback>(url, version, out diagnostic, settings);
204-
}
205-
206-
/// <summary>
207-
/// Reads the stream input and parses it into an Open API document.
208-
/// </summary>
209-
/// <param name="stream">Stream containing OpenAPI description to parse.</param>
210-
/// <param name="format">The OpenAPI format to use during parsing.</param>
211-
/// <param name="version"></param>
212-
/// <param name="diagnostic"></param>
213-
/// <param name="settings"></param>
214-
/// <returns></returns>
215-
public static OpenApiCallback Load(Stream stream,
216-
string format,
217-
OpenApiSpecVersion version,
218-
out OpenApiDiagnostic diagnostic,
219-
OpenApiReaderSettings settings = null)
220-
{
221-
return OpenApiModelFactory.Load<OpenApiCallback>(stream, version, out diagnostic, format, settings);
222-
}
223-
224-
/// <summary>
225-
/// Reads the text reader content and parses it into an Open API document.
226-
/// </summary>
227-
/// <param name="input">TextReader containing OpenAPI description to parse.</param>
228-
/// <param name="format"> The OpenAPI format to use during parsing.</param>
229-
/// <param name="version"></param>
230-
/// <param name="diagnostic"></param>
231-
/// <param name="settings"></param>
232-
/// <returns></returns>
233-
public static OpenApiCallback Load(TextReader input,
234-
string format,
235-
OpenApiSpecVersion version,
236-
out OpenApiDiagnostic diagnostic,
237-
OpenApiReaderSettings settings = null)
238-
{
239-
return OpenApiModelFactory.Load<OpenApiCallback>(input, version, out diagnostic, format, settings);
240-
}
241-
242-
243-
/// <summary>
244-
/// Parses a string into a <see cref="OpenApiDocument"/> object.
245-
/// </summary>
246-
/// <param name="input"> The string input.</param>
247-
/// <param name="version"></param>
248-
/// <param name="diagnostic"></param>
249-
/// <param name="format"></param>
250-
/// <param name="settings"></param>
251-
/// <returns></returns>
252-
public static OpenApiCallback Parse(string input,
253-
OpenApiSpecVersion version,
254-
out OpenApiDiagnostic diagnostic,
255-
string format = null,
256-
OpenApiReaderSettings settings = null)
257-
{
258-
return OpenApiModelFactory.Parse<OpenApiCallback>(input, version, out diagnostic, format, settings);
259-
}
191+
}
260192
}
261193
}

‎src/Microsoft.OpenApi/Models/OpenApiComponents.cs

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -358,73 +358,5 @@ public void SerializeAsV2(IOpenApiWriter writer)
358358
{
359359
// Components object does not exist in V2.
360360
}
361-
362-
/// <summary>
363-
/// Parses a local file path or Url into an Open API document.
364-
/// </summary>
365-
/// <param name="url"> The path to the OpenAPI file.</param>
366-
/// <param name="version">The OpenAPI specification version.</param>
367-
/// <param name="diagnostic"></param>
368-
/// <param name="settings"></param>
369-
/// <returns></returns>
370-
public static OpenApiComponents Load(string url, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings settings = null)
371-
{
372-
return OpenApiModelFactory.Load<OpenApiComponents>(url, version, out diagnostic, settings);
373-
}
374-
375-
/// <summary>
376-
/// Reads the stream input and parses it into an Open API document.
377-
/// </summary>
378-
/// <param name="stream">Stream containing OpenAPI description to parse.</param>
379-
/// <param name="format">The OpenAPI format to use during parsing.</param>
380-
/// <param name="version"></param>
381-
/// <param name="diagnostic"></param>
382-
/// <param name="settings"></param>
383-
/// <returns></returns>
384-
public static OpenApiComponents Load(Stream stream,
385-
string format,
386-
OpenApiSpecVersion version,
387-
out OpenApiDiagnostic diagnostic,
388-
OpenApiReaderSettings settings = null)
389-
{
390-
return OpenApiModelFactory.Load<OpenApiComponents>(stream, version, out diagnostic, format, settings);
391-
}
392-
393-
/// <summary>
394-
/// Reads the text reader content and parses it into an Open API document.
395-
/// </summary>
396-
/// <param name="input">TextReader containing OpenAPI description to parse.</param>
397-
/// <param name="format"> The OpenAPI format to use during parsing.</param>
398-
/// <param name="version"></param>
399-
/// <param name="diagnostic"></param>
400-
/// <param name="settings"></param>
401-
/// <returns></returns>
402-
public static OpenApiComponents Load(TextReader input,
403-
string format,
404-
OpenApiSpecVersion version,
405-
out OpenApiDiagnostic diagnostic,
406-
OpenApiReaderSettings settings = null)
407-
{
408-
return OpenApiModelFactory.Load<OpenApiComponents>(input, version, out diagnostic, format, settings);
409-
}
410-
411-
412-
/// <summary>
413-
/// Parses a string into a <see cref="OpenApiDocument"/> object.
414-
/// </summary>
415-
/// <param name="input"> The string input.</param>
416-
/// <param name="version"></param>
417-
/// <param name="diagnostic"></param>
418-
/// <param name="format"></param>
419-
/// <param name="settings"></param>
420-
/// <returns></returns>
421-
public static OpenApiComponents Parse(string input,
422-
OpenApiSpecVersion version,
423-
out OpenApiDiagnostic diagnostic,
424-
string format = null,
425-
OpenApiReaderSettings settings = null)
426-
{
427-
return OpenApiModelFactory.Parse<OpenApiComponents>(input, version, out diagnostic, format, settings);
428-
}
429361
}
430362
}

‎src/Microsoft.OpenApi/Models/OpenApiContact.cs

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -97,73 +97,5 @@ private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion
9797

9898
writer.WriteEndObject();
9999
}
100-
101-
/// <summary>
102-
/// Parses a local file path or Url into an Open API document.
103-
/// </summary>
104-
/// <param name="url"> The path to the OpenAPI file.</param>
105-
/// <param name="version">The OpenAPI specification version.</param>
106-
/// <param name="diagnostic"></param>
107-
/// <param name="settings"></param>
108-
/// <returns></returns>
109-
public static OpenApiContact Load(string url, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings settings = null)
110-
{
111-
return OpenApiModelFactory.Load<OpenApiContact>(url, version, out diagnostic, settings);
112-
}
113-
114-
/// <summary>
115-
/// Reads the stream input and parses it into an Open API document.
116-
/// </summary>
117-
/// <param name="stream">Stream containing OpenAPI description to parse.</param>
118-
/// <param name="format">The OpenAPI format to use during parsing.</param>
119-
/// <param name="version"></param>
120-
/// <param name="diagnostic"></param>
121-
/// <param name="settings"></param>
122-
/// <returns></returns>
123-
public static OpenApiContact Load(Stream stream,
124-
string format,
125-
OpenApiSpecVersion version,
126-
out OpenApiDiagnostic diagnostic,
127-
OpenApiReaderSettings settings = null)
128-
{
129-
return OpenApiModelFactory.Load<OpenApiContact>(stream, version, out diagnostic, format, settings);
130-
}
131-
132-
/// <summary>
133-
/// Reads the text reader content and parses it into an Open API document.
134-
/// </summary>
135-
/// <param name="input">TextReader containing OpenAPI description to parse.</param>
136-
/// <param name="format"> The OpenAPI format to use during parsing.</param>
137-
/// <param name="version"></param>
138-
/// <param name="diagnostic"></param>
139-
/// <param name="settings"></param>
140-
/// <returns></returns>
141-
public static OpenApiContact Load(TextReader input,
142-
string format,
143-
OpenApiSpecVersion version,
144-
out OpenApiDiagnostic diagnostic,
145-
OpenApiReaderSettings settings = null)
146-
{
147-
return OpenApiModelFactory.Load<OpenApiContact>(input, version, out diagnostic, format, settings);
148-
}
149-
150-
151-
/// <summary>
152-
/// Parses a string into a <see cref="OpenApiDocument"/> object.
153-
/// </summary>
154-
/// <param name="input"> The string input.</param>
155-
/// <param name="version"></param>
156-
/// <param name="diagnostic"></param>
157-
/// <param name="format"></param>
158-
/// <param name="settings"></param>
159-
/// <returns></returns>
160-
public static OpenApiContact Parse(string input,
161-
OpenApiSpecVersion version,
162-
out OpenApiDiagnostic diagnostic,
163-
string format = null,
164-
OpenApiReaderSettings settings = null)
165-
{
166-
return OpenApiModelFactory.Parse<OpenApiContact>(input, version, out diagnostic, format, settings);
167-
}
168100
}
169101
}

‎src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -92,73 +92,5 @@ public void SerializeAsV2(IOpenApiWriter writer)
9292
{
9393
// Discriminator object does not exist in V2.
9494
}
95-
96-
/// <summary>
97-
/// Parses a local file path or Url into an Open API document.
98-
/// </summary>
99-
/// <param name="url"> The path to the OpenAPI file.</param>
100-
/// <param name="version">The OpenAPI specification version.</param>
101-
/// <param name="diagnostic"></param>
102-
/// <param name="settings"></param>
103-
/// <returns></returns>
104-
public static OpenApiDiscriminator Load(string url, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings settings = null)
105-
{
106-
return OpenApiModelFactory.Load<OpenApiDiscriminator>(url, version, out diagnostic, settings);
107-
}
108-
109-
/// <summary>
110-
/// Reads the stream input and parses it into an Open API document.
111-
/// </summary>
112-
/// <param name="stream">Stream containing OpenAPI description to parse.</param>
113-
/// <param name="format">The OpenAPI format to use during parsing.</param>
114-
/// <param name="version"></param>
115-
/// <param name="diagnostic"></param>
116-
/// <param name="settings"></param>
117-
/// <returns></returns>
118-
public static OpenApiDiscriminator Load(Stream stream,
119-
string format,
120-
OpenApiSpecVersion version,
121-
out OpenApiDiagnostic diagnostic,
122-
OpenApiReaderSettings settings = null)
123-
{
124-
return OpenApiModelFactory.Load<OpenApiDiscriminator>(stream, version, out diagnostic, format, settings);
125-
}
126-
127-
/// <summary>
128-
/// Reads the text reader content and parses it into an Open API document.
129-
/// </summary>
130-
/// <param name="input">TextReader containing OpenAPI description to parse.</param>
131-
/// <param name="format"> The OpenAPI format to use during parsing.</param>
132-
/// <param name="version"></param>
133-
/// <param name="diagnostic"></param>
134-
/// <param name="settings"></param>
135-
/// <returns></returns>
136-
public static OpenApiDiscriminator Load(TextReader input,
137-
string format,
138-
OpenApiSpecVersion version,
139-
out OpenApiDiagnostic diagnostic,
140-
OpenApiReaderSettings settings = null)
141-
{
142-
return OpenApiModelFactory.Load<OpenApiDiscriminator>(input, version, out diagnostic, format, settings);
143-
}
144-
145-
146-
/// <summary>
147-
/// Parses a string into a <see cref="OpenApiDocument"/> object.
148-
/// </summary>
149-
/// <param name="input"> The string input.</param>
150-
/// <param name="version"></param>
151-
/// <param name="diagnostic"></param>
152-
/// <param name="format"></param>
153-
/// <param name="settings"></param>
154-
/// <returns></returns>
155-
public static OpenApiDiscriminator Parse(string input,
156-
OpenApiSpecVersion version,
157-
out OpenApiDiagnostic diagnostic,
158-
string format = null,
159-
OpenApiReaderSettings settings = null)
160-
{
161-
return OpenApiModelFactory.Parse<OpenApiDiscriminator>(input, version, out diagnostic, format, settings);
162-
}
16395
}
16496
}

0 commit comments

Comments
 (0)