Skip to content

Fix NullReferenceException during ValueSet serialization in R4/R4B #3328

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

Closed
Copilot wants to merge 9 commits into from
Closed

Fix NullReferenceException during ValueSet serialization in R4/R4B #3328

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5548809
Initial plan
Copilot Oct 24, 2025
3e00f86
Fix: Restrict Property field to R5+ in ValueSet expansion
Copilot Oct 24, 2025
983905a
Apply suggestion from @brendankowitz
alexzautke Oct 28, 2025
64c9610
Merge branch 'develop' into copilot/fix-null-reference-exception
ewoutkramer Oct 28, 2025
841632b
Merge branch 'develop' into copilot/fix-null-reference-exception
alexzautke Oct 28, 2025
c8f696d
Fix build error: Update test to use ToJson instead of ToJsonAsync
Copilot Oct 28, 2025
195ced0
Update test to use item-type ValueSet and verify R5 property field
Copilot Oct 28, 2025
f70d49b
Update test to use diagnostic-service-sections ValueSet
Copilot Oct 28, 2025
b3f2ff3
Revert to using item-type ValueSet for cross-version compatibility
Copilot Oct 28, 2025
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
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Shims.Base/Specification/Terminology/ValueSetExpander.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ internal static ValueSet.ContainsComponent ToContainsComponent(this CodeSystem.C
if (inactiveProperty?.Value is FhirBoolean isInactive)
newContains.Inactive = isInactive.Value;

#if !STU3
#if R5 || R6
Comment thread
alexzautke marked this conversation as resolved.
Outdated
if (source.Property.Any())
{
newContains.Property = source.Property.Select(p => new ValueSet.ConceptPropertyComponent { Code = p.Code, Value = p.Value }).ToList();
Expand Down
36 changes: 36 additions & 0 deletions src/Hl7.Fhir.Specification.Shared.Tests/Source/TerminologyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using FluentAssertions;
using Hl7.Fhir.Model;
using Hl7.Fhir.Rest;
using Hl7.Fhir.Serialization;
using Hl7.Fhir.Specification.Source;
using Hl7.Fhir.Specification.Terminology;
using System;
Expand Down Expand Up @@ -757,6 +758,41 @@ void expandAction(string url)
}
}

/// <summary>
/// Test for issue with ValueSet expansion causing NullReferenceException during serialization
/// when the expansion contains property field that doesn't exist in R4/R4B.
/// The Property field in ValueSet.expansion.contains was introduced in R5.
/// </summary>
[Fact]
public async Tasks.Task ExpandedValueSetShouldSerializeSuccessfully()
{
var server = new LocalTerminologyService(_resolver);
var parameters = new Parameters()
{
Parameter = new List<Parameters.ParameterComponent>
{
new Parameters.ParameterComponent()
{
Name = "url",
Value = new FhirUri("http://hl7.org/fhir/ValueSet/administrative-gender"),
},
},
};

var resource = await server.Expand(parameters);

// This should not throw a NullReferenceException
var json = await resource.ToJsonAsync();

// Verify the expansion was successful
Assert.NotNull(json);
Assert.NotEmpty(json);
var valueSet = resource as ValueSet;
Assert.NotNull(valueSet);
Assert.True(valueSet.HasExpansion);
Assert.True(valueSet.Expansion.Contains.Any());
}

[Fact]
public void TestValidateCodeParametersCode()
{
Expand Down