Skip to content

Commit 69739da

Browse files
committed
review fixes
1 parent 7d07628 commit 69739da

File tree

5 files changed

+8
-24
lines changed

5 files changed

+8
-24
lines changed

src/LEGO.AsyncAPI.Readers/AsyncApiDiagnostics.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,16 @@ public class AsyncApiDiagnostic : IDiagnostic
1414

1515
public AsyncApiVersion SpecificationVersion { get; set; }
1616

17-
public void Append(AsyncApiDiagnostic diagnosticToAdd, string fileNameToAdd = null)
17+
public void Append(AsyncApiDiagnostic diagnosticToAdd)
1818
{
19-
var fileNameIsSupplied = !string.IsNullOrEmpty(fileNameToAdd);
2019
foreach (var error in diagnosticToAdd.Errors)
2120
{
22-
var errMsgWithFileName = fileNameIsSupplied ? $"[File: {fileNameToAdd}] {error.Message}" : error.Message;
23-
this.Errors.Add(new(error.Pointer, errMsgWithFileName));
21+
this.Errors.Add(new(error.Pointer, error.Message));
2422
}
2523

2624
foreach (var warning in diagnosticToAdd.Warnings)
2725
{
28-
var warnMsgWithFileName = fileNameIsSupplied ? $"[File: {fileNameToAdd}] {warning.Message}" : warning.Message;
29-
this.Warnings.Add(new(warning.Pointer, warnMsgWithFileName));
26+
this.Warnings.Add(new(warning.Pointer, warning.Message));
3027
}
3128
}
3229
}

src/LEGO.AsyncAPI.Readers/AsyncApiJsonDocumentReader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private async Task ResolveReferencesAsync(AsyncApiDiagnostic diagnostic, IAsyncA
213213
}
214214

215215
this.context.Workspace.RegisterComponent(reference.Reference.Reference, component);
216-
this.ResolveReferences(diagnostic, component);
216+
await this.ResolveReferencesAsync(diagnostic, component);
217217
}
218218
}
219219

@@ -269,7 +269,7 @@ private IAsyncApiSerializable ResolveExternalReference(AsyncApiDiagnostic diagno
269269
throw new ArgumentNullException(nameof(reference));
270270
}
271271

272-
var loader = this.settings.ExternalReferenceLoader ??= new DefaultStreamLoader(this.settings);
272+
var loader = this.settings.ExternalReferenceLoader ??= new DefaultStreamLoader();
273273
try
274274
{
275275
Stream stream;
@@ -299,7 +299,7 @@ private async Task<IAsyncApiSerializable> ResolveExternalReferenceAsync(AsyncApi
299299
throw new ArgumentNullException(nameof(reference));
300300
}
301301

302-
var loader = this.settings.ExternalReferenceLoader ??= new DefaultStreamLoader(this.settings);
302+
var loader = this.settings.ExternalReferenceLoader ??= new DefaultStreamLoader();
303303
try
304304
{
305305
Stream stream;

src/LEGO.AsyncAPI.Readers/Services/DefaultStreamLoader.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ namespace LEGO.AsyncAPI.Readers.Services
1212
internal class DefaultStreamLoader : IStreamLoader
1313
{
1414
private static readonly HttpClient HttpClient = new HttpClient();
15-
private readonly AsyncApiReaderSettings settings;
16-
17-
public DefaultStreamLoader(AsyncApiReaderSettings settings)
18-
{
19-
this.settings = settings;
20-
}
2115

2216
public Stream Load(Uri uri)
2317
{
@@ -27,11 +21,9 @@ public Stream Load(Uri uri)
2721
{
2822
case "file":
2923
return File.OpenRead(uri.AbsolutePath);
30-
break;
3124
case "http":
3225
case "https":
3326
return HttpClient.GetStreamAsync(uri).GetAwaiter().GetResult();
34-
break;
3527
default:
3628
throw new ArgumentException("Unsupported scheme");
3729
}
@@ -51,11 +43,9 @@ public async Task<Stream> LoadAsync(Uri uri)
5143
{
5244
case "file":
5345
return File.OpenRead(uri.AbsolutePath);
54-
break;
5546
case "http":
5647
case "https":
5748
return await HttpClient.GetStreamAsync(uri);
58-
break;
5949
default:
6050
throw new ArgumentException("Unsupported scheme");
6151
}

src/LEGO.AsyncAPI/Models/AsyncApiReference.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ public class AsyncApiReference : IAsyncApiSerializable
1414
{
1515
private string originalString;
1616

17-
public AsyncApiReference()
18-
{
19-
}
20-
2117
public AsyncApiReference(string reference, ReferenceType? type)
2218
{
2319
if (string.IsNullOrWhiteSpace(reference))

src/LEGO.AsyncAPI/Models/Avro/AsyncApiAvroSchema.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ public static implicit operator AsyncApiAvroSchema(AvroPrimitiveType type)
2424
public abstract void SerializeV2(IAsyncApiWriter writer);
2525

2626
public virtual bool TryGetAs<T>(out T result)
27-
where T : AsyncApiAvroSchema
27+
where T : AsyncApiAvroSchema
2828
{
2929
result = this as T;
3030
return result != null;
3131
}
32+
3233
public virtual bool Is<T>()
3334
where T : AsyncApiAvroSchema
3435
{

0 commit comments

Comments
 (0)