Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed NullReferenceException when enumerating bundled/contained resources #2858

Merged
merged 3 commits into from
Sep 11, 2024
Merged

Fixed NullReferenceException when enumerating bundled/contained resources #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86ea57f
hotfix: incorrect assumption caused NullReferenceExceptions when enum…
Kasdejong Sep 11, 2024
f3262d7
this is more correct. No surprise references now
Kasdejong Sep 11, 2024
fc3c203
Merge branch 'develop' into bundled-resource-cache-hotfix
mmsmits Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/Hl7.Fhir.Base/ElementModel/ReferencedResourceCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,37 @@ namespace Hl7.Fhir.ElementModel;

internal class ReferencedResourceCache : IEnumerable<ScopedNode.BundledResource>
{
private Dictionary<string, ScopedNode?> _items;
private Dictionary<string, ScopedNode> _items;
private List<ScopedNode> _unreferenceableItems; // some resources may not have a reference, but are included nonetheless.

public ReferencedResourceCache(IEnumerable<KeyValuePair<string, ScopedNode?>> items)
public ReferencedResourceCache(IEnumerable<KeyValuePair<string, ScopedNode>> items)
{
_items = new Dictionary<string, ScopedNode?>();
_items = new Dictionary<string, ScopedNode>();
_unreferenceableItems = [];
foreach (var item in items)
{
_items.Add(item.Key, item.Value);
if (item.Key is not null)
_items.Add(item.Key, item.Value);
else
_unreferenceableItems.Add(item.Value);

}
}

internal IEnumerable<ScopedNode> Resources => _items.Values.OfType<ScopedNode>();
internal IEnumerable<ScopedNode> Resources => _items.Values.Concat(_unreferenceableItems);

internal ScopedNode? ResolveReference(string reference)
{
return _items.TryGetValue(reference, out var node) ? node : null;
}

public IEnumerator<ScopedNode.BundledResource> GetEnumerator() => _items.Select(i => new ScopedNode.BundledResource(i.Key, i.Value)).GetEnumerator();
public IEnumerator<ScopedNode.BundledResource> GetEnumerator() =>
_items
.Select(i => new ScopedNode.BundledResource(i.Key, i.Value))
.Concat(
_unreferenceableItems.Select(i => new ScopedNode.BundledResource(null, i))
)
.GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
}

Expand Down
12 changes: 11 additions & 1 deletion src/Hl7.Fhir.ElementModel.Shared.Tests/ScopedNodeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Hl7.Fhir.Model;
using FluentAssertions;
using Hl7.Fhir.Model;
using Hl7.Fhir.Serialization;
using Hl7.Fhir.Specification;
using Hl7.Fhir.Specification.Snapshot;
Expand Down Expand Up @@ -273,6 +274,15 @@ static bool CCDATypeNameMapper(string typeName, out string canonical)


}

[TestMethod]
public void Bundle_WithEntryWithoutFullUrl_ShouldNotThrow()
{
var bundle = new Bundle() { Type = Bundle.BundleType.Batch, Entry = [new Bundle.EntryComponent() { Resource = new Patient() }]}.ToTypedElement().ToScopedNode();

var enumerate = () => bundle.BundledResources();
enumerate.Should().NotThrow().Subject.Should().ContainSingle(c => c.FullUrl == null);
}

private class CCDAResourceResolver : IAsyncResourceResolver
{
Expand Down