Skip to content

Commit 83a15b5

Browse files
committed
ISSUE-1131: Added review improvements
1 parent 10806b7 commit 83a15b5

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,18 @@ public class OpenApiDiagnostic : IDiagnostic
3333
/// </summary>
3434
/// <param name="diagnosticToAdd"></param>
3535
/// <param name="fileNameToAdd"></param>
36-
public void AppendDiagnostic(OpenApiDiagnostic diagnosticToAdd, string fileNameToAdd)
36+
public void AppendDiagnostic(OpenApiDiagnostic diagnosticToAdd, string fileNameToAdd = null)
3737
{
38+
var fileNameIsSupplied = !string.IsNullOrEmpty(fileNameToAdd);
3839
foreach (var err in diagnosticToAdd.Errors)
3940
{
40-
string errMsgWithFileName;
41-
if (!(string.IsNullOrEmpty(fileNameToAdd) || string.IsNullOrWhiteSpace(fileNameToAdd)))
42-
{
43-
errMsgWithFileName = $"[File: {fileNameToAdd}] {err.Message}";
44-
}
45-
else
46-
{
47-
errMsgWithFileName = err.Message;
48-
}
41+
var errMsgWithFileName = fileNameIsSupplied ? $"[File: {fileNameToAdd}] {err.Message}" : err.Message;
4942
Errors.Add(new OpenApiError(err.Pointer, errMsgWithFileName));
5043
}
5144
foreach (var warn in diagnosticToAdd.Warnings)
5245
{
53-
string warnMsgWithFileName;
54-
if (!(string.IsNullOrEmpty(fileNameToAdd) || string.IsNullOrWhiteSpace(fileNameToAdd)))
55-
{
56-
warnMsgWithFileName = $"[File: {fileNameToAdd}] {warn.Message}";
57-
}
58-
else
59-
{
60-
warnMsgWithFileName = warn.Message;
61-
}
62-
Errors.Add(new OpenApiError(warn.Pointer, warnMsgWithFileName));
46+
var warnMsgWithFileName = fileNameIsSupplied ? $"[File: {fileNameToAdd}] {warn.Message}" : warn.Message;
47+
Warnings.Add(new OpenApiError(warn.Pointer, warnMsgWithFileName));
6348
}
6449
}
6550
}

0 commit comments

Comments
 (0)