Skip to content

Commit 32568e8

Browse files
committed
fix: compiler errors
1 parent d9a7bec commit 32568e8

File tree

5 files changed

+44
-8
lines changed

5 files changed

+44
-8
lines changed

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,13 @@ private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer>?
458458
.ToList();
459459

460460
// schemes
461-
writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) => w.WriteValue(s));
461+
writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) =>
462+
{
463+
if(!string.IsNullOrEmpty(s) && s is not null)
464+
{
465+
w.WriteValue(s);
466+
}
467+
});
462468
}
463469
}
464470

src/Microsoft.OpenApi/Models/OpenApiOperation.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,13 @@ public void SerializeAsV2(IOpenApiWriter writer)
337337
.Distinct()
338338
.ToList();
339339

340-
writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) => w.WriteValue(s));
340+
writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) =>
341+
{
342+
if (!string.IsNullOrEmpty(s) && s is not null)
343+
{
344+
w.WriteValue(s);
345+
}
346+
});
341347
}
342348

343349
// deprecated

src/Microsoft.OpenApi/Models/OpenApiReference.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private void SerializeInternal(IOpenApiWriter writer, Action<IOpenApiWriter>? ca
177177
{
178178
Utils.CheckArgumentNull(writer);
179179

180-
if (Type == ReferenceType.Tag)
180+
if (Type == ReferenceType.Tag && !string.IsNullOrEmpty(ReferenceV3) && ReferenceV3 is not null)
181181
{
182182
// Write the string value only
183183
writer.WriteValue(ReferenceV3);
@@ -203,7 +203,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
203203
{
204204
Utils.CheckArgumentNull(writer);
205205

206-
if (Type == ReferenceType.Tag)
206+
if (Type == ReferenceType.Tag && !string.IsNullOrEmpty(ReferenceV2) && ReferenceV2 is not null)
207207
{
208208
// Write the string value only
209209
writer.WriteValue(ReferenceV2);

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,13 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
424424
writer.WriteProperty(OpenApiConstants.MinProperties, MinProperties);
425425

426426
// required
427-
writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) => w.WriteValue(s));
427+
writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) =>
428+
{
429+
if (!string.IsNullOrEmpty(s) && s is not null)
430+
{
431+
w.WriteValue(s);
432+
}
433+
});
428434

429435
// enum
430436
writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (nodeWriter, s) => nodeWriter.WriteAny(s));
@@ -662,7 +668,13 @@ private void SerializeAsV2(
662668
writer.WriteProperty(OpenApiConstants.MinProperties, MinProperties);
663669

664670
// required
665-
writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) => w.WriteValue(s));
671+
writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) =>
672+
{
673+
if (!string.IsNullOrEmpty(s) && s is not null)
674+
{
675+
w.WriteValue(s);
676+
}
677+
});
666678

667679
// enum
668680
writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteAny(s));
@@ -815,7 +827,13 @@ where temporaryType.HasFlag(flag)
815827
select flag.ToFirstIdentifier()).ToList();
816828
if (list.Count > 1)
817829
{
818-
writer.WriteOptionalCollection(OpenApiConstants.Type, list, (w, s) => w.WriteValue(s));
830+
writer.WriteOptionalCollection(OpenApiConstants.Type, list, (w, s) =>
831+
{
832+
if (!string.IsNullOrEmpty(s) && s is not null)
833+
{
834+
w.WriteValue(s);
835+
}
836+
});
819837
}
820838
else
821839
{

src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,13 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
8484
writer.WriteProperty(OpenApiConstants.Description, Description);
8585

8686
// enums
87-
writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteValue(s));
87+
writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) =>
88+
{
89+
if (!string.IsNullOrEmpty(s) && s is not null)
90+
{
91+
w.WriteValue(s);
92+
}
93+
});
8894

8995
// specification extensions
9096
writer.WriteExtensions(Extensions, version);

0 commit comments

Comments
 (0)