Skip to content

Commit d628df8

Browse files
MaggieKimani1MaggieKimani1
committed
Remove obsolete method
1 parent 604388c commit d628df8

File tree

5 files changed

+21
-77
lines changed

5 files changed

+21
-77
lines changed

‎src/Microsoft.OpenApi/Reader/ParseNodes/MapNode.cs

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -79,47 +79,6 @@ public override Dictionary<string, T> CreateMap<T>(Func<MapNode, OpenApiDocument
7979
return nodes.ToDictionary(k => k.key, v => v.value);
8080
}
8181

82-
public override Dictionary<string, T> CreateMapWithReference<T>(
83-
ReferenceType referenceType,
84-
Func<MapNode, OpenApiDocument, T> map)
85-
{
86-
var jsonMap = _node ?? throw new OpenApiReaderException($"Expected map while parsing {typeof(T).Name}", Context);
87-
88-
var nodes = jsonMap.Select(
89-
n =>
90-
{
91-
var key = n.Key;
92-
(string key, T value) entry;
93-
try
94-
{
95-
Context.StartObject(key);
96-
entry = (key,
97-
value: map(new MapNode(Context, (JsonObject)n.Value), null)
98-
);
99-
if (entry.value == null)
100-
{
101-
return default; // Body Parameters shouldn't be converted to Parameters
102-
}
103-
// If the component isn't a reference to another component, then point it to itself.
104-
if (entry.value.Reference == null)
105-
{
106-
entry.value.Reference = new()
107-
{
108-
Type = referenceType,
109-
Id = entry.key
110-
};
111-
}
112-
}
113-
finally
114-
{
115-
Context.EndObject();
116-
}
117-
return entry;
118-
}
119-
);
120-
return nodes.Where(n => n != default).ToDictionary(k => k.key, v => v.value);
121-
}
122-
12382
public override Dictionary<string, JsonSchema> CreateJsonSchemaMapWithReference(
12483
ReferenceType referenceType,
12584
Func<MapNode, OpenApiDocument, JsonSchema> map,

‎src/Microsoft.OpenApi/Reader/ParseNodes/ParseNode.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@ public virtual Dictionary<string, T> CreateMap<T>(Func<MapNode, OpenApiDocument,
5959
throw new OpenApiReaderException("Cannot create map from this type of node.", Context);
6060
}
6161

62-
public virtual Dictionary<string, T> CreateMapWithReference<T>(
63-
ReferenceType referenceType,
64-
Func<MapNode, OpenApiDocument, T> map)
65-
where T : class, IOpenApiReferenceable
66-
{
67-
throw new OpenApiReaderException("Cannot create map from this reference.", Context);
68-
}
69-
7062
public virtual Dictionary<string, JsonSchema> CreateJsonSchemaMapWithReference(
7163
ReferenceType referenceType,
7264
Func<MapNode, OpenApiDocument, JsonSchema> map,

‎src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,9 @@ internal static partial class OpenApiV2Deserializer
7272
o.Components = new();
7373
}
7474

75-
o.Components.Parameters = n.CreateMapWithReference(
76-
ReferenceType.Parameter,
77-
LoadParameter);
75+
o.Components.Parameters = n.CreateMap(LoadParameter);
7876

79-
o.Components.RequestBodies = n.CreateMapWithReference(ReferenceType.RequestBody, (p, d) =>
77+
o.Components.RequestBodies = n.CreateMap((p, d) =>
8078
{
8179
var parameter = LoadParameter(node: p, loadRequestBody: true, hostDocument: d);
8280
return parameter != null ? CreateRequestBody(p.Context, parameter) : null;
@@ -92,9 +90,7 @@ internal static partial class OpenApiV2Deserializer
9290
o.Components = new();
9391
}
9492

95-
o.Components.Responses = n.CreateMapWithReference(
96-
ReferenceType.Response,
97-
LoadResponse);
93+
o.Components.Responses = n.CreateMap(LoadResponse);
9894
}
9995
},
10096
{
@@ -105,10 +101,7 @@ internal static partial class OpenApiV2Deserializer
105101
o.Components = new();
106102
}
107103

108-
o.Components.SecuritySchemes = n.CreateMapWithReference(
109-
ReferenceType.SecurityScheme,
110-
LoadSecurityScheme
111-
);
104+
o.Components.SecuritySchemes = n.CreateMap(LoadSecurityScheme);
112105
}
113106
},
114107
{"security", (o, n) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement)},

‎src/Microsoft.OpenApi/Reader/V3/OpenApiComponentsDeserializer.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ internal static partial class OpenApiV3Deserializer
2121
private static readonly FixedFieldMap<OpenApiComponents> _componentsFixedFields = new()
2222
{
2323
{"schemas", (o, n) => o.Schemas = n.CreateJsonSchemaMapWithReference(ReferenceType.Schema, LoadSchema, OpenApiSpecVersion.OpenApi3_0)},
24-
{"responses", (o, n) => o.Responses = n.CreateMapWithReference(ReferenceType.Response, LoadResponse)},
25-
{"parameters", (o, n) => o.Parameters = n.CreateMapWithReference(ReferenceType.Parameter, LoadParameter)},
26-
{"examples", (o, n) => o.Examples = n.CreateMapWithReference(ReferenceType.Example, LoadExample)},
27-
{"requestBodies", (o, n) => o.RequestBodies = n.CreateMapWithReference(ReferenceType.RequestBody, LoadRequestBody)},
28-
{"headers", (o, n) => o.Headers = n.CreateMapWithReference(ReferenceType.Header, LoadHeader)},
29-
{"securitySchemes", (o, n) => o.SecuritySchemes = n.CreateMapWithReference(ReferenceType.SecurityScheme, LoadSecurityScheme)},
30-
{"links", (o, n) => o.Links = n.CreateMapWithReference(ReferenceType.Link, LoadLink)},
31-
{"callbacks", (o, n) => o.Callbacks = n.CreateMapWithReference(ReferenceType.Callback, LoadCallback)}
24+
{"responses", (o, n) => o.Responses = n.CreateMap(LoadResponse)},
25+
{"parameters", (o, n) => o.Parameters = n.CreateMap(LoadParameter)},
26+
{"examples", (o, n) => o.Examples = n.CreateMap(LoadExample)},
27+
{"requestBodies", (o, n) => o.RequestBodies = n.CreateMap(LoadRequestBody)},
28+
{"headers", (o, n) => o.Headers = n.CreateMap(LoadHeader)},
29+
{"securitySchemes", (o, n) => o.SecuritySchemes = n.CreateMap(LoadSecurityScheme)},
30+
{"links", (o, n) => o.Links = n.CreateMap(LoadLink)},
31+
{"callbacks", (o, n) => o.Callbacks = n.CreateMap(LoadCallback)}
3232
};
3333

3434
private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =

‎src/Microsoft.OpenApi/Reader/V31/OpenApiComponentsDeserializer.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ internal static partial class OpenApiV31Deserializer
1818
private static readonly FixedFieldMap<OpenApiComponents> _componentsFixedFields = new()
1919
{
2020
{"schemas", (o, n) => o.Schemas = n.CreateMap(LoadSchema)},
21-
{"responses", (o, n) => o.Responses = n.CreateMapWithReference(ReferenceType.Response, LoadResponse)},
22-
{"parameters", (o, n) => o.Parameters = n.CreateMapWithReference(ReferenceType.Parameter, LoadParameter)},
23-
{"examples", (o, n) => o.Examples = n.CreateMapWithReference(ReferenceType.Example, LoadExample)},
24-
{"requestBodies", (o, n) => o.RequestBodies = n.CreateMapWithReference(ReferenceType.RequestBody, LoadRequestBody)},
25-
{"headers", (o, n) => o.Headers = n.CreateMapWithReference(ReferenceType.Header, LoadHeader)},
26-
{"securitySchemes", (o, n) => o.SecuritySchemes = n.CreateMapWithReference(ReferenceType.SecurityScheme, LoadSecurityScheme)},
27-
{"links", (o, n) => o.Links = n.CreateMapWithReference(ReferenceType.Link, LoadLink)},
28-
{"callbacks", (o, n) => o.Callbacks = n.CreateMapWithReference(ReferenceType.Callback, LoadCallback)},
29-
{"pathItems", (o, n) => o.PathItems = n.CreateMapWithReference(ReferenceType.PathItem, LoadPathItem)}
21+
{"responses", (o, n) => o.Responses = n.CreateMap(LoadResponse)},
22+
{"parameters", (o, n) => o.Parameters = n.CreateMap(LoadParameter)},
23+
{"examples", (o, n) => o.Examples = n.CreateMap(LoadExample)},
24+
{"requestBodies", (o, n) => o.RequestBodies = n.CreateMap(LoadRequestBody)},
25+
{"headers", (o, n) => o.Headers = n.CreateMap(LoadHeader)},
26+
{"securitySchemes", (o, n) => o.SecuritySchemes = n.CreateMap(LoadSecurityScheme)},
27+
{"links", (o, n) => o.Links = n.CreateMap(LoadLink)},
28+
{"callbacks", (o, n) => o.Callbacks = n.CreateMap(LoadCallback)},
29+
{"pathItems", (o, n) => o.PathItems = n.CreateMap(LoadPathItem)}
3030
};
3131

3232
private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =

0 commit comments

Comments
 (0)