Skip to content

Commit b1a695e

Browse files
committed
Code cleanup
1 parent 8963468 commit b1a695e

19 files changed

+55
-61
lines changed

src/Microsoft.OpenApi/Models/OpenApiCallback.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ private void SerializeInternalWithoutReference(IOpenApiWriter writer, OpenApiSpe
169169
// path items
170170
foreach (var item in PathItems)
171171
{
172-
writer.WriteRequiredObject(item.Key.Expression, item.Value, (w, p) => callback(w, p));
172+
writer.WriteRequiredObject(item.Key.Expression, item.Value, callback);
173173
}
174174

175175
// extensions

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,28 +175,28 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
175175
Action<IOpenApiWriter, IOpenApiReferenceable> action)
176176
{
177177
// info
178-
writer.WriteRequiredObject(OpenApiConstants.Info, Info, (w, i) => callback(w, i));
178+
writer.WriteRequiredObject(OpenApiConstants.Info, Info, callback);
179179

180180
// servers
181-
writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, (w, s) => callback(w, s));
181+
writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, callback);
182182

183183
// paths
184-
writer.WriteRequiredObject(OpenApiConstants.Paths, Paths, (w, p) => callback(w, p));
184+
writer.WriteRequiredObject(OpenApiConstants.Paths, Paths, callback);
185185

186186
// components
187-
writer.WriteOptionalObject(OpenApiConstants.Components, Components, (w, c) => callback(w, c));
187+
writer.WriteOptionalObject(OpenApiConstants.Components, Components, callback);
188188

189189
// security
190190
writer.WriteOptionalCollection(
191191
OpenApiConstants.Security,
192192
SecurityRequirements,
193-
(w, s) => callback(w, s));
193+
callback);
194194

195195
// tags
196196
writer.WriteOptionalCollection(OpenApiConstants.Tags, Tags, (w, t) => action(w, t));
197197

198198
// external docs
199-
writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => callback(w, e));
199+
writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, callback);
200200

201201
// extensions
202202
writer.WriteExtensions(Extensions, version);

src/Microsoft.OpenApi/Models/OpenApiEncoding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
105105
writer.WriteProperty(OpenApiConstants.ContentType, ContentType);
106106

107107
// headers
108-
writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => callback(w, h));
108+
writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, callback);
109109

110110
// style
111111
writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());

src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
7171

7272
foreach (var item in this)
7373
{
74-
writer.WriteRequiredObject(item.Key, item.Value, (w, p) => callback(w, p));
74+
writer.WriteRequiredObject(item.Key, item.Value, callback);
7575
}
7676

7777
writer.WriteExtensions(Extensions, version);

src/Microsoft.OpenApi/Models/OpenApiHeader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,16 @@ private void SerializeInternalWithoutReference(IOpenApiWriter writer, OpenApiSpe
217217
writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
218218

219219
// schema
220-
writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => callback(w, s));
220+
writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, callback);
221221

222222
// example
223223
writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, s) => w.WriteAny(s));
224224

225225
// examples
226-
writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, (w, e) => callback(w, e));
226+
writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, callback);
227227

228228
// content
229-
writer.WriteOptionalMap(OpenApiConstants.Content, Content, (w, c) => callback(w, c));
229+
writer.WriteOptionalMap(OpenApiConstants.Content, Content, callback);
230230

231231
// extensions
232232
writer.WriteExtensions(Extensions, version);

src/Microsoft.OpenApi/Models/OpenApiInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
114114
writer.WriteProperty(OpenApiConstants.TermsOfService, TermsOfService?.OriginalString);
115115

116116
// contact object
117-
writer.WriteOptionalObject(OpenApiConstants.Contact, Contact, (w, c) => callback(w, c));
117+
writer.WriteOptionalObject(OpenApiConstants.Contact, Contact, callback);
118118

119119
// license object
120-
writer.WriteOptionalObject(OpenApiConstants.License, License, (w, l) => callback(w, l));
120+
writer.WriteOptionalObject(OpenApiConstants.License, License, callback);
121121

122122
// version
123123
writer.WriteProperty(OpenApiConstants.Version, Version);

src/Microsoft.OpenApi/Models/OpenApiLink.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private void SerializeInternalWithoutReference(IOpenApiWriter writer, Action<IOp
177177
writer.WriteProperty(OpenApiConstants.Description, Description);
178178

179179
// server
180-
writer.WriteOptionalObject(OpenApiConstants.Server, Server, (w, s) => callback(w, s));
180+
writer.WriteOptionalObject(OpenApiConstants.Server, Server, callback);
181181

182182
writer.WriteEndObject();
183183
}

src/Microsoft.OpenApi/Models/OpenApiMediaType.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,16 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
8989
writer.WriteStartObject();
9090

9191
// schema
92-
writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => callback(w, s));
92+
writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, callback);
9393

9494
// example
9595
writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, e) => w.WriteAny(e));
9696

9797
// examples
98-
writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, (w, e) => callback(w, e));
98+
writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, callback);
9999

100100
// encoding
101-
writer.WriteOptionalMap(OpenApiConstants.Encoding, Encoding, (w, e) => callback(w, e));
101+
writer.WriteOptionalMap(OpenApiConstants.Encoding, Encoding, callback);
102102

103103
// extensions
104104
writer.WriteExtensions(Extensions, version);

src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
8585
writer.WriteStartObject();
8686

8787
// implicit
88-
writer.WriteOptionalObject(OpenApiConstants.Implicit, Implicit, (w, o) => callback(w, o));
88+
writer.WriteOptionalObject(OpenApiConstants.Implicit, Implicit, callback);
8989

9090
// password
91-
writer.WriteOptionalObject(OpenApiConstants.Password, Password, (w, o) => callback(w, o));
91+
writer.WriteOptionalObject(OpenApiConstants.Password, Password, callback);
9292

9393
// clientCredentials
9494
writer.WriteOptionalObject(
9595
OpenApiConstants.ClientCredentials,
9696
ClientCredentials,
97-
(w, o) => callback(w, o));
97+
callback);
9898

9999
// authorizationCode
100100
writer.WriteOptionalObject(
101101
OpenApiConstants.AuthorizationCode,
102102
AuthorizationCode,
103-
(w, o) => callback(w, o));
103+
callback);
104104

105105
// extensions
106106
writer.WriteExtensions(Extensions, version);

src/Microsoft.OpenApi/Models/OpenApiOperation.cs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,7 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
161161
writer.WriteOptionalCollection(
162162
OpenApiConstants.Tags,
163163
Tags,
164-
(w, t) =>
165-
{
166-
callback(w, t);
167-
});
164+
callback);
168165

169166
// summary
170167
writer.WriteProperty(OpenApiConstants.Summary, Summary);
@@ -173,31 +170,31 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
173170
writer.WriteProperty(OpenApiConstants.Description, Description);
174171

175172
// externalDocs
176-
writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => callback(w, e));
173+
writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, callback);
177174

178175
// operationId
179176
writer.WriteProperty(OpenApiConstants.OperationId, OperationId);
180177

181178
// parameters
182-
writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, (w, p) => callback(w, p));
179+
writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, callback);
183180

184181
// requestBody
185-
writer.WriteOptionalObject(OpenApiConstants.RequestBody, RequestBody, (w, r) => callback(w, r));
182+
writer.WriteOptionalObject(OpenApiConstants.RequestBody, RequestBody, callback);
186183

187184
// responses
188-
writer.WriteRequiredObject(OpenApiConstants.Responses, Responses, (w, r) => callback(w, r));
185+
writer.WriteRequiredObject(OpenApiConstants.Responses, Responses, callback);
189186

190187
// callbacks
191-
writer.WriteOptionalMap(OpenApiConstants.Callbacks, Callbacks, (w, c) => callback(w, c));
188+
writer.WriteOptionalMap(OpenApiConstants.Callbacks, Callbacks, callback);
192189

193190
// deprecated
194191
writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
195192

196193
// security
197-
writer.WriteOptionalCollection(OpenApiConstants.Security, Security, (w, s) => callback(w, s));
194+
writer.WriteOptionalCollection(OpenApiConstants.Security, Security, callback);
198195

199196
// servers
200-
writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, (w, s) => callback(w, s));
197+
writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, callback);
201198

202199
// specification extensions
203200
writer.WriteExtensions(Extensions,version);

0 commit comments

Comments
 (0)