Skip to content

Commit 67226d5

Browse files
committed
chore: removes passing reference to document across workflow
1 parent c53ed52 commit 67226d5

File tree

124 files changed

+606
-1081
lines changed

Some content is hidden

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

124 files changed

+606
-1081
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal static class EdmModelHelper
2323
/// Adds the derived types references together with their base type reference in the OneOf property of an OpenAPI schema.
2424
/// </summary>
2525
/// <returns>The OpenAPI schema with the list of derived types references and their base type references set in the OneOf property.</returns>
26-
internal static OpenApiSchema GetDerivedTypesReferenceSchema(IEdmStructuredType structuredType, IEdmModel edmModel, OpenApiDocument document)
26+
internal static OpenApiSchema GetDerivedTypesReferenceSchema(IEdmStructuredType structuredType, IEdmModel edmModel)
2727
{
2828
Utils.CheckArgumentNull(structuredType, nameof(structuredType));
2929
Utils.CheckArgumentNull(edmModel, nameof(edmModel));
@@ -41,12 +41,12 @@ internal static OpenApiSchema GetDerivedTypesReferenceSchema(IEdmStructuredType
4141
OneOf = new List<IOpenApiSchema>()
4242
};
4343

44-
var baseTypeSchema = new OpenApiSchemaReference(schemaElement.FullName(), document);
44+
var baseTypeSchema = new OpenApiSchemaReference(schemaElement.FullName());
4545
schema.OneOf.Add(baseTypeSchema);
4646

4747
foreach (IEdmSchemaElement derivedType in derivedTypes)
4848
{
49-
var derivedTypeSchema = new OpenApiSchemaReference(derivedType.FullName(), document);
49+
var derivedTypeSchema = new OpenApiSchemaReference(derivedType.FullName());
5050
schema.OneOf.Add(derivedTypeSchema);
5151
};
5252

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ internal static class OpenApiOperationExtensions
2323
/// <param name="settings">The settings.</param>
2424
/// <param name="addNoContent">Optional: Whether to add a 204 no content response.</param>
2525
/// <param name="schema">Optional: The OpenAPI schema of the response.</param>
26-
/// <param name="document">The OpenAPI document to lookup references.</param>
27-
public static void AddErrorResponses(this OpenApiOperation operation, OpenApiConvertSettings settings, OpenApiDocument document, bool addNoContent = false, IOpenApiSchema schema = null)
26+
public static void AddErrorResponses(this OpenApiOperation operation, OpenApiConvertSettings settings, bool addNoContent = false, IOpenApiSchema schema = null)
2827
{
2928
Utils.CheckArgumentNull(operation, nameof(operation));
3029
Utils.CheckArgumentNull(settings, nameof(settings));
31-
Utils.CheckArgumentNull(document, nameof(document));
3230

3331
if (operation.Responses == null)
3432
{
@@ -57,22 +55,22 @@ public static void AddErrorResponses(this OpenApiOperation operation, OpenApiCon
5755
}
5856
};
5957
}
60-
operation.Responses.Add(Constants.StatusCodeClass2XX, response ?? Constants.StatusCodeClass2XX.GetResponse(document));
58+
operation.Responses.Add(Constants.StatusCodeClass2XX, response ?? Constants.StatusCodeClass2XX.GetResponse());
6159
}
6260
else
6361
{
64-
operation.Responses.Add(Constants.StatusCode204, Constants.StatusCode204.GetResponse(document));
62+
operation.Responses.Add(Constants.StatusCode204, Constants.StatusCode204.GetResponse());
6563
}
6664
}
6765

6866
if (settings.ErrorResponsesAsDefault)
6967
{
70-
operation.Responses.Add(Constants.StatusCodeDefault, Constants.StatusCodeDefault.GetResponse(document));
68+
operation.Responses.Add(Constants.StatusCodeDefault, Constants.StatusCodeDefault.GetResponse());
7169
}
7270
else
7371
{
74-
operation.Responses.Add(Constants.StatusCodeClass4XX, Constants.StatusCodeClass4XX.GetResponse(document));
75-
operation.Responses.Add(Constants.StatusCodeClass5XX, Constants.StatusCodeClass5XX.GetResponse(document));
72+
operation.Responses.Add(Constants.StatusCodeClass4XX, Constants.StatusCodeClass4XX.GetResponse());
73+
operation.Responses.Add(Constants.StatusCodeClass5XX, Constants.StatusCodeClass5XX.GetResponse());
7674
}
7775
}
7876
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public ODataContext(IEdmModel model, OpenApiConvertSettings settings)
5050
visitor.Visit(model);
5151
IsSpatialTypeUsed = visitor.IsSpatialTypeUsed;
5252

53-
OperationHandlerProvider = new OperationHandlerProvider();
54-
PathItemHandlerProvider = new PathItemHandlerProvider();
53+
OperationHandlerProvider = new CachedOperationHandlerProvider(new OperationHandlerProvider());
54+
PathItemHandlerProvider = new CachedPathItemHandlerProvider(new PathItemHandlerProvider());
5555

5656
// If no path provider, use the default path provider.
5757
_pathProvider = settings.PathProvider ?? new ODataPathProvider();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public static OpenApiDocument CreateDocument(this ODataContext context)
4646
context.AddComponentsToDocument(doc);
4747
context.AddPathsToDocument(doc);
4848
doc.Tags = context.CreateTags(); // order matters so the operation generators have populated the tags
49+
doc.RegisterComponents();
50+
doc.SetReferenceHostDocument();
4951

5052

5153
return doc;

0 commit comments

Comments
 (0)