Skip to content

Commit f270b90

Browse files
committed
Simplify using statement and switch condition
1 parent 8e45f8b commit f270b90

File tree

1 file changed

+16
-33
lines changed

1 file changed

+16
-33
lines changed

src/Microsoft.OpenApi.Tool/OpenApiService.cs

Lines changed: 16 additions & 33 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.IO;
44
using System.Linq;
@@ -52,43 +52,26 @@ public static void ProcessOpenApiDocument(
5252
errorReport.AppendLine(error.ToString());
5353
}
5454

55-
throw new ArgumentException(String.Join(Environment.NewLine, context.Errors.Select(e => e.Message).ToArray()));
55+
throw new ArgumentException(string.Join(Environment.NewLine, context.Errors.Select(e => e.Message).ToArray()));
5656
}
5757

58-
using (var outputStream = output?.Create())
59-
{
60-
TextWriter textWriter;
58+
using var outputStream = output?.Create();
6159

62-
if (outputStream != null)
63-
{
64-
textWriter = new StreamWriter(outputStream);
65-
}
66-
else
67-
{
68-
textWriter = Console.Out;
69-
}
60+
var textWriter = outputStream != null ? new StreamWriter(outputStream) : Console.Out;
7061

71-
var settings = new OpenApiWriterSettings()
72-
{
73-
ReferenceInline = inline == true ? ReferenceInlineSetting.InlineLocalReferences : ReferenceInlineSetting.DoNotInlineReferences
74-
};
75-
IOpenApiWriter writer;
76-
switch (format)
77-
{
78-
case OpenApiFormat.Json:
79-
writer = new OpenApiJsonWriter(textWriter, settings);
80-
break;
81-
case OpenApiFormat.Yaml:
82-
writer = new OpenApiYamlWriter(textWriter, settings);
83-
break;
84-
default:
85-
throw new ArgumentException("Unknown format");
86-
}
87-
88-
document.Serialize(writer, version);
62+
var settings = new OpenApiWriterSettings()
63+
{
64+
ReferenceInline = inline ? ReferenceInlineSetting.InlineLocalReferences : ReferenceInlineSetting.DoNotInlineReferences
65+
};
66+
IOpenApiWriter writer = format switch
67+
{
68+
OpenApiFormat.Json => new OpenApiJsonWriter(textWriter, settings),
69+
OpenApiFormat.Yaml => new OpenApiYamlWriter(textWriter, settings),
70+
_ => throw new ArgumentException("Unknown format"),
71+
};
72+
document.Serialize(writer, version);
8973

90-
textWriter.Flush();
91-
}
74+
textWriter.Flush();
9275
}
9376

9477
private static Stream GetStream(string input)

0 commit comments

Comments
 (0)