Skip to content

Commit 87afc90

Browse files
xuzhgxuzhg
committed
Change the extension methods for write properties
1 parent d2ad750 commit 87afc90

24 files changed

+257
-230
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ private void WriteInternal(IOpenApiWriter writer)
6363
writer.WriteStartObject();
6464

6565
// name
66-
writer.WriteStringProperty(OpenApiConstants.Name, Name);
66+
writer.WriteProperty(OpenApiConstants.Name, Name);
6767

6868
// url
69-
writer.WriteStringProperty(OpenApiConstants.Url, Url?.OriginalString);
69+
writer.WriteProperty(OpenApiConstants.Url, Url?.OriginalString);
7070

7171
// email
72-
writer.WriteStringProperty(OpenApiConstants.Email, Email);
72+
writer.WriteProperty(OpenApiConstants.Email, Email);
7373

7474
// extensions
7575
writer.WriteExtensions(Extensions);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ internal override void WriteAsV3(IOpenApiWriter writer)
3636
writer.WriteStartObject();
3737

3838
// propertyName
39-
writer.WriteStringProperty(OpenApiConstants.PropertyName, PropertyName);
39+
writer.WriteProperty(OpenApiConstants.PropertyName, PropertyName);
4040

4141
// mapping
4242
writer.WriteOptionalMap(OpenApiConstants.Mapping, Mapping, (w, s) => w.WriteValue(s));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ internal override void WriteAsV3(IOpenApiWriter writer)
7575
writer.WriteStartObject();
7676

7777
// openapi
78-
writer.WriteStringProperty(OpenApiConstants.OpenApi, SpecVersion.ToString());
78+
writer.WriteProperty(OpenApiConstants.OpenApi, SpecVersion.ToString());
7979

8080
// info
8181
writer.WriteRequiredObject(OpenApiConstants.Info, Info, (w, i) => i.WriteAsV3(w));
@@ -117,7 +117,7 @@ internal override void WriteAsV2(IOpenApiWriter writer)
117117
writer.WriteStartObject();
118118

119119
// swagger
120-
writer.WriteStringProperty(OpenApiConstants.Swagger, SpecVersion.ToString());
120+
writer.WriteProperty(OpenApiConstants.Swagger, SpecVersion.ToString());
121121

122122
// info
123123
writer.WriteRequiredObject(OpenApiConstants.Info, Info, (w, i) => i.WriteAsV2(w));
@@ -171,12 +171,12 @@ private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer>
171171
var firstServerUrl = new Uri(firstServer.Url);
172172

173173
// host
174-
writer.WriteStringProperty(
174+
writer.WriteProperty(
175175
OpenApiConstants.Host,
176176
firstServerUrl.GetComponents(UriComponents.Host | UriComponents.Port, UriFormat.SafeUnescaped));
177177

178178
// basePath
179-
writer.WriteStringProperty(OpenApiConstants.BasePath, firstServerUrl.AbsolutePath);
179+
writer.WriteProperty(OpenApiConstants.BasePath, firstServerUrl.AbsolutePath);
180180

181181
// Consider all schemes of the URLs in the server list that have the same
182182
// host, port, and base path as the first server.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,24 @@ internal override void WriteAsV3(IOpenApiWriter writer)
6868
writer.WriteStartObject();
6969

7070
// contentType
71-
writer.WriteStringProperty(OpenApiConstants.ContentType, ContentType);
71+
writer.WriteProperty(OpenApiConstants.ContentType, ContentType);
7272

7373
// headers
7474
writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => h.WriteAsV3(w));
7575

7676
// style
77-
writer.WriteStringProperty(OpenApiConstants.Style, Style?.GetDisplayName());
77+
writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
7878

7979
// explode
8080
if (Explode != null)
8181
{
82-
writer.WriteBoolProperty(OpenApiConstants.Explode, Explode.Value, false);
82+
writer.WriteProperty(OpenApiConstants.Explode, Explode.Value, false);
8383
}
8484

8585
// allowReserved
8686
if (AllowReserved != null)
8787
{
88-
writer.WriteBoolProperty(OpenApiConstants.AllowReserved, AllowReserved.Value, false);
88+
writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved.Value, false);
8989
}
9090

9191
// extensions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@ internal override void WriteAsV3(IOpenApiWriter writer)
7171
else
7272
{
7373
writer.WriteStartObject();
74-
writer.WriteStringProperty("summary", Summary);
75-
writer.WriteStringProperty("description", Description);
74+
writer.WriteProperty("summary", Summary);
75+
writer.WriteProperty("description", Description);
7676

7777
if (Value != null)
7878
{
7979
writer.WritePropertyName("value");
8080
writer.WriteRaw(Value);
8181
} else if (ExternalValue != null)
8282
{
83-
writer.WriteStringProperty("externalValue", ExternalValue);
83+
writer.WriteProperty("externalValue", ExternalValue);
8484
}
8585

8686
writer.WriteExtensions(Extensions);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ private void WriteInternal(IOpenApiWriter writer)
5656

5757
writer.WriteStartObject();
5858

59-
writer.WriteStringProperty(OpenApiConstants.Description, Description);
59+
writer.WriteProperty(OpenApiConstants.Description, Description);
6060

61-
writer.WriteStringProperty(OpenApiConstants.Url, Url?.OriginalString);
61+
writer.WriteProperty(OpenApiConstants.Url, Url?.OriginalString);
6262

6363
writer.WriteExtensions(Extensions);
6464

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,25 +99,25 @@ internal override void WriteAsV3(IOpenApiWriter writer)
9999
writer.WriteStartObject();
100100

101101
// description
102-
writer.WriteStringProperty(OpenApiConstants.Description, Description);
102+
writer.WriteProperty(OpenApiConstants.Description, Description);
103103

104104
// required
105-
writer.WriteBoolProperty(OpenApiConstants.Required, Required, false);
105+
writer.WriteProperty(OpenApiConstants.Required, Required, false);
106106

107107
// deprecated
108-
writer.WriteBoolProperty(OpenApiConstants.Deprecated, Deprecated, false);
108+
writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
109109

110110
// allowEmptyValue
111-
writer.WriteBoolProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
111+
writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
112112

113113
// style
114-
writer.WriteStringProperty(OpenApiConstants.Style, Style?.GetDisplayName());
114+
writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
115115

116116
// explode
117-
writer.WriteBoolProperty(OpenApiConstants.Explode, Explode, false);
117+
writer.WriteProperty(OpenApiConstants.Explode, Explode, false);
118118

119119
// allowReserved
120-
writer.WriteBoolProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
120+
writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
121121

122122
// schema
123123
writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.WriteAsV3(w));
@@ -157,25 +157,25 @@ internal override void WriteAsV2(IOpenApiWriter writer)
157157
writer.WriteStartObject();
158158

159159
// description
160-
writer.WriteStringProperty(OpenApiConstants.Description, Description);
160+
writer.WriteProperty(OpenApiConstants.Description, Description);
161161

162162
// required
163-
writer.WriteBoolProperty(OpenApiConstants.Required, Required, false);
163+
writer.WriteProperty(OpenApiConstants.Required, Required, false);
164164

165165
// deprecated
166-
writer.WriteBoolProperty(OpenApiConstants.Deprecated, Deprecated, false);
166+
writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
167167

168168
// allowEmptyValue
169-
writer.WriteBoolProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
169+
writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
170170

171171
// style
172-
writer.WriteStringProperty(OpenApiConstants.Style, Style?.GetDisplayName());
172+
writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
173173

174174
// explode
175-
writer.WriteBoolProperty(OpenApiConstants.Explode, Explode, false);
175+
writer.WriteProperty(OpenApiConstants.Explode, Explode, false);
176176

177177
// allowReserved
178-
writer.WriteBoolProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
178+
writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
179179

180180
// schema
181181
writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.WriteAsV2(w));

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ internal override void WriteAsV3(IOpenApiWriter writer)
6464
writer.WriteStartObject();
6565

6666
// title
67-
writer.WriteStringProperty(OpenApiConstants.Title, Title);
67+
writer.WriteProperty(OpenApiConstants.Title, Title);
6868

6969
// description
70-
writer.WriteStringProperty(OpenApiConstants.Description, Description);
70+
writer.WriteProperty(OpenApiConstants.Description, Description);
7171

7272
// termsOfService
73-
writer.WriteStringProperty(OpenApiConstants.TermsOfService, TermsOfService?.OriginalString);
73+
writer.WriteProperty(OpenApiConstants.TermsOfService, TermsOfService?.OriginalString);
7474

7575
// contact object
7676
writer.WriteOptionalObject(OpenApiConstants.Contact, Contact, (w, c) => c.WriteAsV3(w));
@@ -79,7 +79,7 @@ internal override void WriteAsV3(IOpenApiWriter writer)
7979
writer.WriteOptionalObject(OpenApiConstants.License, License, (w, l) => l.WriteAsV3(w));
8080

8181
// version
82-
writer.WriteStringProperty(OpenApiConstants.Version, Version?.ToString());
82+
writer.WriteProperty(OpenApiConstants.Version, Version?.ToString());
8383

8484
// specification extensions
8585
writer.WriteExtensions(Extensions);
@@ -100,13 +100,13 @@ internal override void WriteAsV2(IOpenApiWriter writer)
100100
writer.WriteStartObject();
101101

102102
// title
103-
writer.WriteStringProperty(OpenApiConstants.Title, Title);
103+
writer.WriteProperty(OpenApiConstants.Title, Title);
104104

105105
// description
106-
writer.WriteStringProperty(OpenApiConstants.Description, Description);
106+
writer.WriteProperty(OpenApiConstants.Description, Description);
107107

108108
// termsOfService
109-
writer.WriteStringProperty(OpenApiConstants.TermsOfService, TermsOfService?.OriginalString);
109+
writer.WriteProperty(OpenApiConstants.TermsOfService, TermsOfService?.OriginalString);
110110

111111
// contact object
112112
writer.WriteOptionalObject(OpenApiConstants.Contact, Contact, (w, c) => c.WriteAsV2(w));
@@ -115,7 +115,7 @@ internal override void WriteAsV2(IOpenApiWriter writer)
115115
writer.WriteOptionalObject(OpenApiConstants.License, License, (w, l) => l.WriteAsV2(w));
116116

117117
// version
118-
writer.WriteStringProperty(OpenApiConstants.Version, Version?.ToString());
118+
writer.WriteProperty(OpenApiConstants.Version, Version?.ToString());
119119

120120
// specification extensions
121121
writer.WriteExtensions(Extensions);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ private void WriteInternal(IOpenApiWriter writer)
5757
writer.WriteStartObject();
5858

5959
// name
60-
writer.WriteStringProperty(OpenApiConstants.Name, Name);
60+
writer.WriteProperty(OpenApiConstants.Name, Name);
6161

6262
// url
63-
writer.WriteStringProperty(OpenApiConstants.Url, Url?.OriginalString);
63+
writer.WriteProperty(OpenApiConstants.Url, Url?.OriginalString);
6464

6565
// specification extensions
6666
writer.WriteExtensions(Extensions);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ internal override void WriteAsV3(IOpenApiWriter writer)
7676
writer.WriteStartObject();
7777

7878
// operationRef
79-
writer.WriteStringProperty(OpenApiConstants.OperationRef, OperationRef);
79+
writer.WriteProperty(OpenApiConstants.OperationRef, OperationRef);
8080

8181
// operationId
82-
writer.WriteStringProperty(OpenApiConstants.OperationId, OperationId);
82+
writer.WriteProperty(OpenApiConstants.OperationId, OperationId);
8383

8484
// parameters
8585
writer.WriteOptionalMap(OpenApiConstants.Parameters, Parameters, (w, p) => p.WriteValue(w));
@@ -88,7 +88,7 @@ internal override void WriteAsV3(IOpenApiWriter writer)
8888
writer.WriteOptionalObject(OpenApiConstants.RequestBody, RequestBody, (w, r) => r.WriteValue(w));
8989

9090
// description
91-
writer.WriteStringProperty(OpenApiConstants.Description, Description);
91+
writer.WriteProperty(OpenApiConstants.Description, Description);
9292

9393
// server
9494
writer.WriteOptionalObject(OpenApiConstants.Server, Server, (w, s) => s.WriteAsV3(w));

0 commit comments

Comments
 (0)