Skip to content

Commit a256053

Browse files
baywetbaywet
committed
chore: reverts some undesired changes
Signed-off-by: Vincent Biret <[email protected]>
1 parent 40a22f8 commit a256053

File tree

8 files changed

+5
-94
lines changed

8 files changed

+5
-94
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,6 @@ public static class OpenApiConstants
210210
/// </summary>
211211
public const string RequestBody = "requestBody";
212212

213-
/// <summary>
214-
/// Field: Query (OpenAPI 3.2)
215-
/// </summary>
216-
public const string Query = "query";
217-
218-
/// <summary>
219-
/// Field: AdditionalOperations (OpenAPI 3.2)
220-
/// </summary>
221-
public const string AdditionalOperations = "additionalOperations";
222-
223213
/// <summary>
224214
/// Field: ExtensionFieldNamePrefix
225215
/// </summary>

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

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,6 @@ public ISet<OpenApiTagReference>? Tags
110110
/// </summary>
111111
public IList<OpenApiServer>? Servers { get; set; }
112112

113-
/// <summary>
114-
/// Gets the query operation for this operation (OpenAPI 3.2).
115-
/// </summary>
116-
public OpenApiOperation? Query { get; set; }
117-
118-
/// <summary>
119-
/// Gets the additional operations for this operation (OpenAPI 3.2).
120-
/// A map of additional operations that are not one of the standard HTTP methods (GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE).
121-
/// </summary>
122-
public IDictionary<string, OpenApiOperation>? AdditionalOperations { get; set; }
123-
124113
/// <summary>
125114
/// This object MAY be extended with Specification Extensions.
126115
/// </summary>
@@ -152,9 +141,6 @@ public OpenApiOperation(OpenApiOperation operation)
152141
Deprecated = operation.Deprecated;
153142
Security = operation.Security != null ? [.. operation.Security] : null;
154143
Servers = operation.Servers != null ? [.. operation.Servers] : null;
155-
Query = operation.Query != null ? new OpenApiOperation(operation.Query) : null;
156-
AdditionalOperations = operation.AdditionalOperations != null ?
157-
new Dictionary<string, OpenApiOperation>(operation.AdditionalOperations.ToDictionary(kvp => kvp.Key, kvp => new OpenApiOperation(kvp.Value))) : null;
158144
Extensions = operation.Extensions != null ? new Dictionary<string, IOpenApiExtension>(operation.Extensions) : null;
159145
Metadata = operation.Metadata != null ? new Dictionary<string, object>(operation.Metadata) : null;
160146
}
@@ -172,21 +158,21 @@ public virtual void SerializeAsV32(IOpenApiWriter writer)
172158
/// </summary>
173159
public virtual void SerializeAsV31(IOpenApiWriter writer)
174160
{
175-
SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer), downgradeFrom32: true);
161+
SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
176162
}
177163

178164
/// <summary>
179165
/// Serialize <see cref="OpenApiOperation"/> to Open Api v3.0.
180166
/// </summary>
181167
public virtual void SerializeAsV3(IOpenApiWriter writer)
182168
{
183-
SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer), downgradeFrom32: true);
169+
SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
184170
}
185171

186172
/// <summary>
187173
/// Serialize <see cref="OpenApiOperation"/> to Open Api v3.0.
188174
/// </summary>
189-
private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version, Action<IOpenApiWriter, IOpenApiSerializable> callback, bool downgradeFrom32 = false)
175+
private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version, Action<IOpenApiWriter, IOpenApiSerializable> callback)
190176
{
191177
Utils.CheckArgumentNull(writer);
192178

@@ -222,21 +208,6 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
222208
// callbacks
223209
writer.WriteOptionalMap(OpenApiConstants.Callbacks, Callbacks, callback);
224210

225-
// OpenAPI 3.2 specific fields
226-
if (version == OpenApiSpecVersion.OpenApi3_2)
227-
{
228-
// query operation
229-
writer.WriteOptionalObject(OpenApiConstants.Query, Query, callback);
230-
231-
// additional operations
232-
writer.WriteOptionalMap(OpenApiConstants.AdditionalOperations, AdditionalOperations, callback);
233-
}
234-
else if (downgradeFrom32)
235-
{
236-
// When downgrading from 3.2 to 3.1/3.0, serialize as extensions
237-
WriteV32FieldsAsExtensions(writer);
238-
}
239-
240211
// deprecated
241212
writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
242213

@@ -252,29 +223,6 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
252223
writer.WriteEndObject();
253224
}
254225

255-
/// <summary>
256-
/// Writes OpenAPI 3.2 specific fields as extensions when downgrading to older versions
257-
/// </summary>
258-
private void WriteV32FieldsAsExtensions(IOpenApiWriter writer)
259-
{
260-
if (Query != null)
261-
{
262-
writer.WritePropertyName(OpenApiConstants.ExtensionFieldNamePrefix + "oas-" + OpenApiConstants.Query);
263-
Query.SerializeAsV31(writer);
264-
}
265-
266-
if (AdditionalOperations != null && AdditionalOperations.Count > 0)
267-
{
268-
writer.WritePropertyName(OpenApiConstants.ExtensionFieldNamePrefix + "oas-" + OpenApiConstants.AdditionalOperations);
269-
writer.WriteStartObject();
270-
foreach (var kvp in AdditionalOperations)
271-
{
272-
writer.WriteOptionalObject(kvp.Key, kvp.Value, (w, o) => o.SerializeAsV31(w));
273-
}
274-
writer.WriteEndObject();
275-
}
276-
}
277-
278226
/// <summary>
279227
/// Serialize <see cref="OpenApiOperation"/> to Open Api v2.0.
280228
/// </summary>
@@ -401,9 +349,6 @@ public virtual void SerializeAsV2(IOpenApiWriter writer)
401349
// security
402350
writer.WriteOptionalCollection(OpenApiConstants.Security, Security, (w, s) => s.SerializeAsV2(w));
403351

404-
// Write Query and AdditionalOperations as extensions when downgrading to v2
405-
WriteV32FieldsAsExtensions(writer);
406-
407352
// specification extensions
408353
writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
409354

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System;
55
using System.Collections.Generic;
6-
using System.Linq;
76
using System.Net.Http;
87

98
namespace Microsoft.OpenApi
@@ -55,8 +54,7 @@ internal OpenApiPathItem(IOpenApiPathItem pathItem)
5554
Utils.CheckArgumentNull(pathItem);
5655
Summary = pathItem.Summary ?? Summary;
5756
Description = pathItem.Description ?? Description;
58-
Operations = pathItem.Operations != null ?
59-
new Dictionary<HttpMethod, OpenApiOperation>(pathItem.Operations.ToDictionary(kvp => kvp.Key, kvp => new OpenApiOperation(kvp.Value))) : null;
57+
Operations = pathItem.Operations != null ? new Dictionary<HttpMethod, OpenApiOperation>(pathItem.Operations) : null;
6058
Servers = pathItem.Servers != null ? [.. pathItem.Servers] : null;
6159
Parameters = pathItem.Parameters != null ? [.. pathItem.Parameters] : null;
6260
Extensions = pathItem.Extensions != null ? new Dictionary<string, IOpenApiExtension>(pathItem.Extensions) : null;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ internal static partial class OpenApiV2Deserializer
100100
private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
101101
new()
102102
{
103-
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix + "oas-query", StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.Query = LoadOperation(n, t)},
104-
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix + "oas-additionalOperations", StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.AdditionalOperations = n.CreateMap(LoadOperation, t)},
105103
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))}
106104
};
107105

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ internal static partial class OpenApiV3Deserializer
9797
private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
9898
new()
9999
{
100-
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix + "oas-query", StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.Query = LoadOperation(n, t)},
101-
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix + "oas-additionalOperations", StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.AdditionalOperations = n.CreateMap(LoadOperation, t)},
102100
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))},
103101
};
104102

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ internal static partial class OpenApiV31Deserializer
111111
private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
112112
new()
113113
{
114-
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix + "oas-query", StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.Query = LoadOperation(n, t)},
115-
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix + "oas-additionalOperations", StringComparison.OrdinalIgnoreCase), (o, p, n, t) => o.AdditionalOperations = n.CreateMap(LoadOperation, t)},
116114
{s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))},
117115
};
118116

‎src/Microsoft.OpenApi/Reader/V32/OpenApiOperationDeserializer.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Text.Json.Nodes;
@@ -106,18 +106,6 @@ internal static partial class OpenApiV32Deserializer
106106
o.Servers = n.CreateList(LoadServer, t);
107107
}
108108
},
109-
{
110-
"query", (o, n, t) =>
111-
{
112-
o.Query = LoadOperation(n, t);
113-
}
114-
},
115-
{
116-
"additionalOperations", (o, n, t) =>
117-
{
118-
o.AdditionalOperations = n.CreateMap(LoadOperation, t);
119-
}
120-
},
121109
};
122110

123111
private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =

‎test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ namespace Microsoft.OpenApi
423423
public static class OpenApiConstants
424424
{
425425
public const string AccessCode = "accessCode";
426-
public const string AdditionalOperations = "additionalOperations";
427426
public const string AdditionalProperties = "additionalProperties";
428427
public const string AllOf = "allOf";
429428
public const string AllowEmptyValue = "allowEmptyValue";
@@ -537,7 +536,6 @@ namespace Microsoft.OpenApi
537536
public const string Properties = "properties";
538537
public const string PropertyName = "propertyName";
539538
public const string Put = "put";
540-
public const string Query = "query";
541539
public const string ReadOnly = "readOnly";
542540
public const string RecursiveAnchor = "$recursiveAnchor";
543541
public const string RecursiveRef = "$recursiveRef";
@@ -964,7 +962,6 @@ namespace Microsoft.OpenApi
964962
{
965963
public OpenApiOperation() { }
966964
public OpenApiOperation(Microsoft.OpenApi.OpenApiOperation operation) { }
967-
public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.OpenApiOperation>? AdditionalOperations { get; set; }
968965
public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.IOpenApiCallback>? Callbacks { get; set; }
969966
public bool Deprecated { get; set; }
970967
public string? Description { get; set; }
@@ -973,7 +970,6 @@ namespace Microsoft.OpenApi
973970
public System.Collections.Generic.IDictionary<string, object>? Metadata { get; set; }
974971
public string? OperationId { get; set; }
975972
public System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiParameter>? Parameters { get; set; }
976-
public Microsoft.OpenApi.OpenApiOperation? Query { get; set; }
977973
public Microsoft.OpenApi.IOpenApiRequestBody? RequestBody { get; set; }
978974
public Microsoft.OpenApi.OpenApiResponses? Responses { get; set; }
979975
public System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiSecurityRequirement>? Security { get; set; }

0 commit comments

Comments
 (0)