Skip to content

Commit 07d912d

Browse files
VisualBeancoderabbitai[bot]
VisualBean
and
coderabbitai[bot]
authored
fix: try read relative uri's as files. (#21)
* Fix: Try read relative uri's as files. Signed-off-by: Alex Wichmann <VisualBean@users.noreply.github.com> * Update src/ByteBard.AsyncAPI.Readers/Services/DefaultStreamLoader.cs Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Signed-off-by: Alex Wichmann <VisualBean@users.noreply.github.com> * Apply suggestion from @VisualBean Signed-off-by: Alex Wichmann <VisualBean@users.noreply.github.com> * Apply suggestion from @VisualBean Signed-off-by: Alex Wichmann <VisualBean@users.noreply.github.com> * Apply suggestion from @VisualBean Signed-off-by: Alex Wichmann <VisualBean@users.noreply.github.com> * Apply suggestion from @VisualBean Signed-off-by: Alex Wichmann <VisualBean@users.noreply.github.com> * Refactor method signatures to include `baseUri` parameter Updated all methods in `IStreamLoader`, `DefaultStreamLoader`, and related tests to accept both `baseUri` and `uri`. Added a new property `BaseUri` to `AsyncApiReaderSettings` for resolving relative references. Adjusted the implementation of external reference loading in `AsyncApiJsonDocumentReader`. --------- Signed-off-by: Alex Wichmann <VisualBean@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent e9666d0 commit 07d912d

5 files changed

Lines changed: 49 additions & 30 deletions

File tree

‎src/ByteBard.AsyncAPI.Readers/AsyncApiJsonDocumentReader.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ private IAsyncApiSerializable ResolveExternalReference(AsyncApiDiagnostic diagno
280280
}
281281
else
282282
{
283-
stream = loader.Load(new Uri(reference.Reference.ExternalResource, UriKind.RelativeOrAbsolute));
283+
stream = loader.Load(this.settings.BaseUri, new Uri(reference.Reference.ExternalResource, UriKind.RelativeOrAbsolute));
284284
this.context.Workspace.RegisterComponent(reference.Reference.ExternalResource, stream);
285285
}
286286

@@ -310,7 +310,7 @@ private async Task<IAsyncApiSerializable> ResolveExternalReferenceAsync(AsyncApi
310310
}
311311
else
312312
{
313-
stream = await loader.LoadAsync(new Uri(reference.Reference.ExternalResource, UriKind.RelativeOrAbsolute));
313+
stream = await loader.LoadAsync(this.settings.BaseUri, new Uri(reference.Reference.ExternalResource, UriKind.RelativeOrAbsolute));
314314
this.context.Workspace.RegisterComponent(reference.Reference.ExternalResource, stream);
315315
}
316316

‎src/ByteBard.AsyncAPI.Readers/AsyncApiReaderSettings.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ public ICollection<IBindingParser<IBinding>>
7070
/// </summary>
7171
public bool LeaveStreamOpen { get; set; }
7272

73+
/// <summary>
74+
/// Uri where relative references should be resolved from when using the External Reference Loader.
75+
/// </summary>
76+
public Uri? BaseUri { get; set; }
77+
7378
/// <summary>
7479
/// External reference reader implementation provided by users for reading external resources.
7580
/// </summary>

‎src/ByteBard.AsyncAPI.Readers/Interface/IStreamLoader.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ namespace ByteBard.AsyncAPI.Readers.Interface
66

77
public interface IStreamLoader
88
{
9-
Task<Stream> LoadAsync(Uri uri);
9+
Task<Stream> LoadAsync(Uri baseUri, Uri uri);
1010

11-
Stream Load(Uri uri);
11+
Stream Load(Uri baseUri, Uri uri);
1212
}
1313
}

‎src/ByteBard.AsyncAPI.Readers/Services/DefaultStreamLoader.cs‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,54 @@ internal class DefaultStreamLoader : IStreamLoader
1111
{
1212
private static readonly HttpClient HttpClient = new HttpClient();
1313

14-
public Stream Load(Uri uri)
14+
public Stream Load(Uri baseUri, Uri uri)
1515
{
1616
try
1717
{
18-
switch (uri.Scheme)
18+
if (uri.IsAbsoluteUri)
1919
{
20-
case "file":
21-
return File.OpenRead(uri.AbsolutePath);
22-
case "http":
23-
case "https":
24-
return HttpClient.GetStreamAsync(uri).GetAwaiter().GetResult();
25-
default:
26-
throw new ArgumentException("Unsupported scheme");
20+
switch (uri.Scheme.ToLowerInvariant())
21+
{
22+
case "file":
23+
return File.OpenRead(uri.LocalPath);
24+
case "http":
25+
case "https":
26+
return HttpClient.GetStreamAsync(uri).GetAwaiter().GetResult();
27+
default:
28+
throw new ArgumentException("Unsupported scheme");
29+
}
30+
}
31+
else
32+
{
33+
return File.OpenRead(new Uri(baseUri, uri).LocalPath);
2734
}
2835
}
2936
catch (Exception ex)
3037
{
31-
throw new AsyncApiReaderException($"Something went wrong trying to fetch '{uri.OriginalString}. {ex.Message}'", ex);
38+
throw new AsyncApiReaderException($"Something went wrong trying to fetch '{uri.OriginalString}'. {ex.Message}", ex);
3239
}
3340
}
3441

35-
public async Task<Stream> LoadAsync(Uri uri)
42+
public async Task<Stream> LoadAsync(Uri baseUri, Uri uri)
3643
{
3744
try
3845
{
39-
switch (uri.Scheme)
46+
if (uri.IsAbsoluteUri)
47+
{
48+
switch (uri.Scheme.ToLowerInvariant())
49+
{
50+
case "file":
51+
return File.OpenRead(uri.LocalPath);
52+
case "http":
53+
case "https":
54+
return await HttpClient.GetStreamAsync(uri);
55+
default:
56+
throw new ArgumentException("Unsupported scheme");
57+
}
58+
}
59+
else
4060
{
41-
case "file":
42-
return File.OpenRead(uri.AbsolutePath);
43-
case "http":
44-
case "https":
45-
return await HttpClient.GetStreamAsync(uri);
46-
default:
47-
throw new ArgumentException("Unsupported scheme");
61+
return File.OpenRead(new Uri(baseUri, uri).LocalPath);
4862
}
4963
}
5064
catch (Exception ex)
@@ -53,4 +67,4 @@ public async Task<Stream> LoadAsync(Uri uri)
5367
}
5468
}
5569
}
56-
}
70+
}

‎test/ByteBard.AsyncAPI.Tests/Models/AsyncApiReference_Should.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ public MockStringLoader(string input)
525525

526526
private readonly string input;
527527

528-
public Stream Load(Uri uri)
528+
public Stream Load(Uri baseUri, Uri uri)
529529
{
530530
var stream = new MemoryStream();
531531
var writer = new StreamWriter(stream);
@@ -535,9 +535,9 @@ public Stream Load(Uri uri)
535535
return stream;
536536
}
537537

538-
public Task<Stream> LoadAsync(Uri uri)
538+
public Task<Stream> LoadAsync(Uri baseUri, Uri uri)
539539
{
540-
return Task.FromResult(this.Load(uri));
540+
return Task.FromResult(this.Load(baseUri, uri));
541541
}
542542
}
543543

@@ -564,7 +564,7 @@ public class MockJsonSchemaLoader : IStreamLoader
564564
description: Light intensity measured in lumens.
565565
""";
566566

567-
public Stream Load(Uri uri)
567+
public Stream Load(Uri baseUri, Uri uri)
568568
{
569569
var stream = new MemoryStream();
570570
var writer = new StreamWriter(stream);
@@ -581,9 +581,9 @@ public Stream Load(Uri uri)
581581
return stream;
582582
}
583583

584-
public Task<Stream> LoadAsync(Uri uri)
584+
public Task<Stream> LoadAsync(Uri baseUri, Uri uri)
585585
{
586-
return Task.FromResult(this.Load(uri));
586+
return Task.FromResult(this.Load(baseUri, uri));
587587
}
588588
}
589589
}

0 commit comments

Comments
 (0)