Skip to content

Commit e86cf20

Browse files
VisualBeanVisualBean
authored
fix(writerextensions): consistency (LEGO#72)
1 parent d24226d commit e86cf20

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎src/LEGO.AsyncAPI/Models/AsyncApiSchema.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -255,43 +255,43 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
255255
writer.WriteOptionalProperty(AsyncApiConstants.Title, this.Title);
256256

257257
// multipleOf
258-
writer.WriteProperty(AsyncApiConstants.MultipleOf, this.MultipleOf);
258+
writer.WriteOptionalProperty(AsyncApiConstants.MultipleOf, this.MultipleOf);
259259

260260
// maximum
261-
writer.WriteProperty(AsyncApiConstants.Maximum, this.Maximum);
261+
writer.WriteOptionalProperty(AsyncApiConstants.Maximum, this.Maximum);
262262

263263
// exclusiveMaximum
264-
writer.WriteProperty(AsyncApiConstants.ExclusiveMaximum, this.ExclusiveMaximum);
264+
writer.WriteOptionalProperty(AsyncApiConstants.ExclusiveMaximum, this.ExclusiveMaximum);
265265

266266
// minimum
267-
writer.WriteProperty(AsyncApiConstants.Minimum, this.Minimum);
267+
writer.WriteOptionalProperty(AsyncApiConstants.Minimum, this.Minimum);
268268

269269
// exclusiveMinimum
270-
writer.WriteProperty(AsyncApiConstants.ExclusiveMinimum, this.ExclusiveMinimum);
270+
writer.WriteOptionalProperty(AsyncApiConstants.ExclusiveMinimum, this.ExclusiveMinimum);
271271

272272
// maxLength
273-
writer.WriteProperty(AsyncApiConstants.MaxLength, this.MaxLength);
273+
writer.WriteOptionalProperty(AsyncApiConstants.MaxLength, this.MaxLength);
274274

275275
// minLength
276-
writer.WriteProperty(AsyncApiConstants.MinLength, this.MinLength);
276+
writer.WriteOptionalProperty(AsyncApiConstants.MinLength, this.MinLength);
277277

278278
// pattern
279279
writer.WriteOptionalProperty(AsyncApiConstants.Pattern, this.Pattern);
280280

281281
// maxItems
282-
writer.WriteProperty(AsyncApiConstants.MaxItems, this.MaxItems);
282+
writer.WriteOptionalProperty(AsyncApiConstants.MaxItems, this.MaxItems);
283283

284284
// minItems
285-
writer.WriteProperty(AsyncApiConstants.MinItems, this.MinItems);
285+
writer.WriteOptionalProperty(AsyncApiConstants.MinItems, this.MinItems);
286286

287287
// uniqueItems
288-
writer.WriteProperty(AsyncApiConstants.UniqueItems, this.UniqueItems);
288+
writer.WriteOptionalProperty(AsyncApiConstants.UniqueItems, this.UniqueItems);
289289

290290
// maxProperties
291-
writer.WriteProperty(AsyncApiConstants.MaxProperties, this.MaxProperties);
291+
writer.WriteOptionalProperty(AsyncApiConstants.MaxProperties, this.MaxProperties);
292292

293293
// minProperties
294-
writer.WriteProperty(AsyncApiConstants.MinProperties, this.MinProperties);
294+
writer.WriteOptionalProperty(AsyncApiConstants.MinProperties, this.MinProperties);
295295

296296
// required
297297
writer.WriteOptionalCollection(AsyncApiConstants.Required, this.Required, (w, s) => w.WriteValue(s));
@@ -357,16 +357,16 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
357357
writer.WriteOptionalObject(AsyncApiConstants.Default, this.Default, (w, d) => w.WriteAny(d));
358358

359359
// nullable
360-
writer.WriteProperty(AsyncApiConstants.Nullable, this.Nullable, false);
360+
writer.WriteOptionalProperty(AsyncApiConstants.Nullable, this.Nullable, false);
361361

362362
// discriminator
363363
writer.WriteOptionalProperty(AsyncApiConstants.Discriminator, this.Discriminator);
364364

365365
// readOnly
366-
writer.WriteProperty(AsyncApiConstants.ReadOnly, this.ReadOnly, false);
366+
writer.WriteOptionalProperty(AsyncApiConstants.ReadOnly, this.ReadOnly, false);
367367

368368
// writeOnly
369-
writer.WriteProperty(AsyncApiConstants.WriteOnly, this.WriteOnly, false);
369+
writer.WriteOptionalProperty(AsyncApiConstants.WriteOnly, this.WriteOnly, false);
370370

371371
// externalDocs
372372
writer.WriteOptionalObject(AsyncApiConstants.ExternalDocs, this.ExternalDocs, (w, s) => s.SerializeV2(w));
@@ -375,7 +375,7 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
375375
writer.WriteOptionalCollection(AsyncApiConstants.Examples, this.Examples, (w, e) => w.WriteAny(e));
376376

377377
// deprecated
378-
writer.WriteProperty(AsyncApiConstants.Deprecated, this.Deprecated, false);
378+
writer.WriteOptionalProperty(AsyncApiConstants.Deprecated, this.Deprecated, false);
379379

380380
// extensions
381381
writer.WriteExtensions(this.Extensions, AsyncApiVersion.AsyncApi2_3_0);

‎src/LEGO.AsyncAPI/Models/Bindings/Http/HttpMessageBinding.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
4545

4646
writer.WriteStartObject();
4747

48-
writer.WriteRequiredObject(AsyncApiConstants.Headers, Headers, (w, h) => h.SerializeV2(w));
48+
writer.WriteOptionalObject(AsyncApiConstants.Headers, Headers, (w, h) => h.SerializeV2(w));
4949
writer.WriteOptionalProperty(AsyncApiConstants.BindingVersion, BindingVersion);
5050

5151
writer.WriteEndObject();

‎src/LEGO.AsyncAPI/Models/Bindings/Http/HttpOperationBinding.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
4545
writer.WriteStartObject();
4646

4747
writer.WriteRequiredProperty(AsyncApiConstants.Type, Type);
48-
writer.WriteRequiredProperty(AsyncApiConstants.Method, Method);
49-
writer.WriteRequiredObject(AsyncApiConstants.Query, Query, (w, h) => h.SerializeV2(w));
48+
writer.WriteOptionalProperty(AsyncApiConstants.Method, Method);
49+
writer.WriteOptionalObject(AsyncApiConstants.Query, Query, (w, h) => h.SerializeV2(w));
5050
writer.WriteOptionalProperty(AsyncApiConstants.BindingVersion, BindingVersion);
5151

5252
writer.WriteEndObject();

‎src/LEGO.AsyncAPI/Models/Bindings/Kafka/KafkaChannelBinding.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
5252

5353
writer.WriteStartObject();
5454
writer.WriteOptionalProperty(AsyncApiConstants.Topic, Topic);
55-
writer.WriteProperty(AsyncApiConstants.Partitions, Partitions);
56-
writer.WriteProperty(AsyncApiConstants.Replicas, Replicas);
55+
writer.WriteOptionalProperty<int>(AsyncApiConstants.Partitions, Partitions);
56+
writer.WriteOptionalProperty<int>(AsyncApiConstants.Replicas, Replicas);
5757
writer.WriteOptionalProperty(AsyncApiConstants.BindingVersion, BindingVersion);
5858

5959
writer.WriteEndObject();

‎src/LEGO.AsyncAPI/Models/Bindings/Kafka/KafkaMessageBinding.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
5959

6060
writer.WriteStartObject();
6161

62-
writer.WriteRequiredObject(AsyncApiConstants.Key, Key, (w, h) => h.SerializeV2(w));
62+
writer.WriteOptionalObject(AsyncApiConstants.Key, Key, (w, h) => h.SerializeV2(w));
6363
writer.WriteOptionalProperty(AsyncApiConstants.SchemaIdLocation, SchemaIdLocation);
6464
writer.WriteOptionalProperty(AsyncApiConstants.SchemaIdPayloadEncoding, SchemaIdPayloadEncoding);
6565
writer.WriteOptionalProperty(AsyncApiConstants.SchemaLookupStrategy, SchemaLookupStrategy);

‎src/LEGO.AsyncAPI/Models/Bindings/Kafka/KafkaOperationBinding.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public void SerializeV2WithoutReference(IAsyncApiWriter writer)
4747
}
4848

4949
writer.WriteStartObject();
50-
writer.WriteRequiredObject(AsyncApiConstants.GroupId, GroupId, (w, h) => h.SerializeV2(w));
51-
writer.WriteRequiredObject(AsyncApiConstants.ClientId, ClientId, (w, h) => h.SerializeV2(w));
50+
writer.WriteOptionalObject(AsyncApiConstants.GroupId, GroupId, (w, h) => h.SerializeV2(w));
51+
writer.WriteOptionalObject(AsyncApiConstants.ClientId, ClientId, (w, h) => h.SerializeV2(w));
5252
writer.WriteOptionalProperty(AsyncApiConstants.BindingVersion, BindingVersion);
5353

5454
writer.WriteEndObject();

src/LEGO.AsyncAPI/Writers/OpenApiWriterExtensions.cs renamed to src/LEGO.AsyncAPI/Writers/AsyncApiWriterExtensions.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static void WriteRequiredProperty(this IAsyncApiWriter writer, string nam
5555
/// <param name="name">The property name.</param>
5656
/// <param name="value">The property value.</param>
5757
/// <param name="defaultValue">The default boolean value.</param>
58-
public static void WriteProperty(this IAsyncApiWriter writer, string name, bool value, bool defaultValue = false)
58+
public static void WriteOptionalProperty(this IAsyncApiWriter writer, string name, bool value, bool defaultValue = false)
5959
{
6060
if (value == defaultValue)
6161
{
@@ -74,7 +74,7 @@ public static void WriteProperty(this IAsyncApiWriter writer, string name, bool
7474
/// <param name="name">The property name.</param>
7575
/// <param name="value">The property value.</param>
7676
/// <param name="defaultValue">The default boolean value.</param>
77-
public static void WriteProperty(
77+
public static void WriteOptionalProperty(
7878
this IAsyncApiWriter writer,
7979
string name,
8080
bool? value,
@@ -96,15 +96,15 @@ public static void WriteProperty(
9696
/// <param name="writer">The writer.</param>
9797
/// <param name="name">The property name.</param>
9898
/// <param name="value">The property value.</param>
99-
public static void WriteProperty<T>(this IAsyncApiWriter writer, string name, T? value)
99+
public static void WriteOptionalProperty<T>(this IAsyncApiWriter writer, string name, T? value)
100100
where T : struct
101101
{
102102
if (value == null)
103103
{
104104
return;
105105
}
106106

107-
writer.WriteProperty(name, value.Value);
107+
writer.WriteRequiredProperty(name, value.Value);
108108
}
109109

110110
/// <summary>
@@ -113,7 +113,7 @@ public static void WriteProperty<T>(this IAsyncApiWriter writer, string name, T?
113113
/// <param name="writer">The writer.</param>
114114
/// <param name="name">The property name.</param>
115115
/// <param name="value">The property value.</param>
116-
public static void WriteProperty<T>(this IAsyncApiWriter writer, string name, T value)
116+
public static void WriteRequiredProperty<T>(this IAsyncApiWriter writer, string name, T value)
117117
where T : struct
118118
{
119119
CheckArguments(writer, name);

0 commit comments

Comments
 (0)