Skip to content

Canonical now parses fragment only URLs #3030

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

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Canonical now parses fragment only URLs #3030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f181deb
remove exception when no url is found when parsing a canonical
mmsmits Feb 5, 2025
0d359c2
add WithValueSet(Canonical canonical) function to ValidateCodeParameters
mmsmits Feb 5, 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
7 changes: 3 additions & 4 deletions src/Hl7.Fhir.Base/Model/Canonical.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@ public Canonical(Uri uri) : this(uri?.OriginalString)
/// </summary>
public Canonical(string? uri, string? version, string? fragment = null)
{
if (uri == null) throw Error.ArgumentNull(nameof(uri));
if (uri.IndexOfAny(['|', '#']) != -1)
if ((uri is not null) && uri.IndexOfAny(['|', '#']) != -1)
throw Error.Argument(nameof(uri), "cannot contain version/fragment data");

if (version != null && version.IndexOfAny(['|', '#']) != -1)
if ((version is not null) && version.IndexOfAny(['|', '#']) != -1)
throw Error.Argument(nameof(version), "cannot contain version/fragment data");

if (fragment != null && fragment.IndexOfAny(['|', '#']) != -1)
if ((fragment is not null) && fragment.IndexOfAny(['|', '#']) != -1)
throw Error.Argument(nameof(fragment), "already contains version/fragment data");


Expand Down
13 changes: 13 additions & 0 deletions src/Hl7.Fhir.Base/Specification/Terminology/ValidateCodeParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,19 @@ public ValidateCodeParameters WithValueSet(string? url, string? context = null,
return this;
}

/// <summary>
/// Takes a canonical and splits it into the correct "url", and "valueSetVersion" parameters.
/// </summary>
/// <param name="canonical">Canonical to be split up</param>
/// <returns></returns>
public ValidateCodeParameters WithValueSet(Canonical canonical)
{
var (uri, version, fragment) = canonical;
Url = new FhirUri(new Canonical(uri, null, fragment));
if (!string.IsNullOrWhiteSpace(version)) ValueSetVersion = new FhirString(version);
return this;
}

public ValidateCodeParameters WithCode(string? code = null, string? system = null,
string? systemVersion = null, string? display = null, string? displayLanguage = null,
string? context = null, bool? inferSystem = null)
Expand Down
10 changes: 10 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
Expand Up @@ -801,6 +801,16 @@ public void TestValidateCodeParametersValueSet()
paramResource.Parameter.Should().ContainSingle(p => p.Name == "context" && ((FhirUri)p.Value).Value == "Patient.gender");
paramResource.Parameter.Should().ContainSingle(p => p.Name == "valueSet" && ((ValueSet)p.Resource) != null);
paramResource.Parameter.Should().ContainSingle(p => p.Name == "valueSetVersion" && ((FhirString)p.Value).Value == "1.0.4");


parameters = new ValidateCodeParameters()
.WithValueSet(new Canonical("http://foo.bar/ValueSet/foo|1.0.4#fragment"));
parameters.Url.Value.Should().Be("http://foo.bar/ValueSet/foo#fragment");
parameters.ValueSetVersion.Value.Should().Be("1.0.4");

parameters = new ValidateCodeParameters()
.WithValueSet(new Canonical("#fragment"));
parameters.Url.Value.Should().Be("#fragment");
}


Expand Down