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

3061 Fix nullability warnings #3063

Merged
merged 18 commits into from
Feb 26, 2025
Merged

3061 Fix nullability warnings #3063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
290b363
Made property access use the private property instead of getter
ewoutkramer Feb 22, 2025
5a51c41
WIP nullability - manually repair errors we never caught.
ewoutkramer Feb 22, 2025
6ddcec7
Compiles, but with tons of warnings about possible mistakes!
ewoutkramer Feb 24, 2025
b283ffc
Oops, list initialization was wrong.
ewoutkramer Feb 24, 2025
2895a27
WIP
ewoutkramer Feb 24, 2025
43daa7c
Herlper properies that are lists should not be null.
ewoutkramer Feb 24, 2025
93408ea
Merge branch '2908-add-nullability' into 2908-fix-nullability-warnings
ewoutkramer Feb 24, 2025
7efe6de
Got all unit tests running.
ewoutkramer Feb 24, 2025
a5d8940
Latest updates
ewoutkramer Feb 24, 2025
e8624c5
Merge branch '2908-add-nullability' into 2908-fix-nullability-warnings
ewoutkramer Feb 24, 2025
72c04b0
Update compat suppressions.
ewoutkramer Feb 24, 2025
3a15750
Merge branch 'develop-6.0' into 3061-add-nullability
Kasdejong Feb 26, 2025
ff11b54
rebasing
ewoutkramer Feb 24, 2025
31f3669
Got all unit tests running.
ewoutkramer Feb 24, 2025
1deac73
Update compat suppressions.
ewoutkramer Feb 24, 2025
70635cd
compat suppressions
Kasdejong Feb 26, 2025
b723f18
Merge remote-tracking branch 'origin/3061-fix-nullability-warnings' i…
Kasdejong Feb 26, 2025
b2f64ac
Updates because of PR review.
ewoutkramer Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
156 changes: 155 additions & 1 deletion src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0001</DiagnosticId>
Expand Down Expand Up @@ -1023,6 +1023,20 @@
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.CodedExtensions.ToCodings(Hl7.Fhir.Model.DataType)</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.CodedExtensions.ToCodings(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.DataType})</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.Date.op_Equality(Hl7.Fhir.Model.Date,Hl7.Fhir.Model.Date)</Target>
Expand Down Expand Up @@ -1079,6 +1093,13 @@
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.ExactMatchEqualityComparer.GetHashCode(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base})</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.FhirBoolean.IsValidValue(System.String)</Target>
Expand Down Expand Up @@ -1149,6 +1170,13 @@
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.ICoded.ToCodings</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.Instant.op_Equality(Hl7.Fhir.Model.Instant,Hl7.Fhir.Model.Instant)</Target>
Expand Down Expand Up @@ -1240,6 +1268,34 @@
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PatternMatchEqualityComparer.GetHashCode(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base})</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PocoEqualityComparisons.IsExactly(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base},System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base})</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PocoEqualityComparisons.ListEquals``1(System.Collections.Generic.IEqualityComparer{``0},System.Collections.Generic.IEnumerable{``0},System.Collections.Generic.IEnumerable{``0})</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PocoEqualityComparisons.Matches(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base},System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base})</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PositiveInt.IsValidValue(System.String)</Target>
Expand Down Expand Up @@ -2941,6 +2997,20 @@
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.CodedExtensions.ToCodings(Hl7.Fhir.Model.DataType)</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.CodedExtensions.ToCodings(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.DataType})</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.Date.op_Equality(Hl7.Fhir.Model.Date,Hl7.Fhir.Model.Date)</Target>
Expand Down Expand Up @@ -2997,6 +3067,13 @@
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.ExactMatchEqualityComparer.GetHashCode(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base})</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.FhirBoolean.IsValidValue(System.String)</Target>
Expand Down Expand Up @@ -3067,6 +3144,13 @@
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.ICoded.ToCodings</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.Instant.op_Equality(Hl7.Fhir.Model.Instant,Hl7.Fhir.Model.Instant)</Target>
Expand Down Expand Up @@ -3158,6 +3242,34 @@
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PatternMatchEqualityComparer.GetHashCode(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base})</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PocoEqualityComparisons.IsExactly(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base},System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base})</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PocoEqualityComparisons.ListEquals``1(System.Collections.Generic.IEqualityComparer{``0},System.Collections.Generic.IEnumerable{``0},System.Collections.Generic.IEnumerable{``0})</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PocoEqualityComparisons.Matches(System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base},System.Collections.Generic.IEnumerable{Hl7.Fhir.Model.Base})</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Hl7.Fhir.Model.PositiveInt.IsValidValue(System.String)</Target>
Expand Down Expand Up @@ -4383,13 +4495,27 @@
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>M:Hl7.Fhir.Model.ICoded.ToCodings</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>M:Hl7.Fhir.Serialization.IDeserializationValidator.ValidateInstance(Hl7.Fhir.Model.Base,Hl7.Fhir.Serialization.InstanceDeserializationContext@,Hl7.Fhir.Validation.CodedValidationException[]@)</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>M:Hl7.Fhir.Model.ICoded.ToCodings</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
<Target>M:Hl7.Fhir.Serialization.IDeserializationValidator.ValidateInstance(Hl7.Fhir.Model.Base,Hl7.Fhir.Serialization.InstanceDeserializationContext@,Hl7.Fhir.Validation.CodedValidationException[]@)</Target>
Expand Down Expand Up @@ -4684,6 +4810,13 @@
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Hl7.Fhir.Model.ExactMatchEqualityComparer</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Hl7.Fhir.Model.Extension</Target>
Expand Down Expand Up @@ -4831,6 +4964,13 @@
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Hl7.Fhir.Model.PatternMatchEqualityComparer</Target>
<Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
<Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Hl7.Fhir.Model.Period</Target>
Expand Down Expand Up @@ -5209,6 +5349,13 @@
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Hl7.Fhir.Model.ExactMatchEqualityComparer</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Hl7.Fhir.Model.Extension</Target>
Expand Down Expand Up @@ -5356,6 +5503,13 @@
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Hl7.Fhir.Model.PatternMatchEqualityComparer</Target>
<Left>lib/netstandard2.1/Hl7.Fhir.Base.dll</Left>
<Right>lib/netstandard2.1/Hl7.Fhir.Base.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Hl7.Fhir.Model.Period</Target>
Expand Down
1 change: 1 addition & 0 deletions src/Hl7.Fhir.Base/Hl7.Fhir.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<Title>Firely's HL7 FHIR SDK Base Class Library</Title>
<Description>Firely's HL7 FHIR SDK Base Class Library. Is a dependency for the FHIR release-specific NuGet packages and is usually not directly referenced.</Description>
<PackageTags>HL7;FHIR;Firely;SDK;BCL</PackageTags>
<RootNamespace>Hl7.Fhir</RootNamespace>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
Expand Down
14 changes: 9 additions & 5 deletions src/Hl7.Fhir.Base/Model/Base.Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/*
* Copyright (c) 2025, Firely (info@fire.ly) and contributors
* See the file CONTRIBUTORS for details.
*
* This file is licensed under the BSD 3-Clause license
* available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE
*/

#nullable enable
using Hl7.Fhir.ElementModel;
using Hl7.Fhir.Introspection;
using Hl7.Fhir.Rest;
using Hl7.Fhir.Utility;

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

Expand Down
4 changes: 2 additions & 2 deletions src/Hl7.Fhir.Base/Model/Bundle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ public Uri? Alternate

private Uri? getLink(string rel)
{
if (Link is null) return null;
if (!Link.Any()) return null;

var entry = Link.FirstOrDefault(e => rel.Equals(e.Relation, StringComparison.OrdinalIgnoreCase));

return entry != null ? new Uri(entry.Url, UriKind.RelativeOrAbsolute) : null;
return entry?.Url != null ? new Uri(entry.Url, UriKind.RelativeOrAbsolute) : null;
}

private void setLink(string rel, Uri? uri)
Expand Down
10 changes: 6 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 @@ -128,23 +128,25 @@ public static Canonical ForCoreType(string typename)
/// <summary>
/// The version string of the canonical (if present).
/// </summary>
public string? Version => splitCanonical(Value).version;
public string? Version => Value is null ? null : splitCanonical(Value).version;

/// <summary>
/// Optional anchor at the end of the canonical, without the '#' prefix.
/// </summary>
public string? Fragment => splitCanonical(Value).fragment;
public string? Fragment => Value is null ? null : splitCanonical(Value).fragment;

/// <summary>
/// The uri part of the canonical, which is the canonical without the version indication.
/// </summary>
public string? Uri => splitCanonical(Value).url;
public string? Uri => Value is null ? null : splitCanonical(Value).url;

/// <summary>
/// Converts the canonical to a <see cref="System.Uri" />.
/// </summary>
/// <returns></returns>
public Uri ToUri() => new(Value, UriKind.RelativeOrAbsolute);
public Uri ToUri() => new(
Value ?? throw new InvalidOperationException("Cannot turn a canonical without a value into a Uri"),
UriKind.RelativeOrAbsolute);

/// <summary>
/// Whether the canonical is a relative or an absolute uri.
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Base/Model/Code.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@ Value is not null
public static bool IsValidValue(string value) => Regex.IsMatch(value, "^" + PATTERN + "$", RegexOptions.Singleline);

/// <inheritdoc cref="ICoded.ToCodings"/>
public virtual IEnumerable<Coding> ToCodings() => [new(system: null, code: Value)];
public virtual IReadOnlyCollection<Coding> ToCodings() => [new(system: null, code: Value)];
}
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Base/Model/CodeOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public override object? ObjectValue
public static new bool IsValidValue(string value) => doParse(value) is not null;

/// <inheritdoc />
public override IEnumerable<Coding> ToCodings() => [new(Value?.GetSystem(), Value?.GetLiteral())];
public override IReadOnlyCollection<Coding> ToCodings() => [new(Value?.GetSystem(), Value?.GetLiteral())];

protected internal override P.Any? TryConvertToSystemTypeInternal() =>
Value is not null ? new P.Code(Value.GetSystem(), Value.GetLiteral()!, display: null, version: null) : null;
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Base/Model/CodeableConcept.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ bool P.IToSystemPrimitive.TryConvertToSystemType([NotNullWhen(true)] out P.Any?
}

/// <inheritdoc cref="ICoded.ToCodings"/>
public IEnumerable<Coding> ToCodings() => Coding;
public IReadOnlyCollection<Coding> ToCodings() => Coding;
}
4 changes: 2 additions & 2 deletions src/Hl7.Fhir.Base/Model/CodeableReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public P.Concept ToSystemConcept() =>
"and can therefore not be converted to a System Concept.");

internal P.Concept? ToSystemConceptInternal() =>
((P.IToSystemPrimitive)Concept)?.TryConvertToSystemType(out var result) == true ? (P.Concept)result : null;
((P.IToSystemPrimitive?)Concept)?.TryConvertToSystemType(out var result) == true ? (P.Concept)result : null;

/// <summary>
/// Converts the reference part of this CodeableReference to a <see cref="P.String" />.
Expand Down Expand Up @@ -79,5 +79,5 @@ bool P.IToSystemPrimitive.TryConvertToSystemType([NotNullWhen(true)] out P.Any?
}

/// <inheritdoc cref="ICoded.ToCodings"/>
public IEnumerable<Coding> ToCodings() => Concept?.ToCodings() ?? [];
public IReadOnlyCollection<Coding> ToCodings() => Concept?.ToCodings() ?? [];
}
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Base/Model/Coding.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ bool P.IToSystemPrimitive.TryConvertToSystemType([NotNullWhen(true)] out P.Any?
: null;

/// <inheritdoc cref="ICoded.ToCodings()"/>
public IEnumerable<Coding> ToCodings() => [this];
public IReadOnlyCollection<Coding> ToCodings() => [this];
}
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Base/Model/Extension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public Extension(string url, DataType value)
this.Value = value;
}

public IEnumerable<Coding> ToCodings() => Value switch
public IReadOnlyCollection<Coding> ToCodings() => Value switch
{
ICoded coded => coded.ToCodings(),
_ => []
Expand Down
2 changes: 1 addition & 1 deletion src/Hl7.Fhir.Base/Model/FhirString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ public P.String ToSystemString() =>
protected internal override P.Any? TryConvertToSystemTypeInternal() => Value is not null ? new P.String(Value) : null;

/// <inheritdoc cref="ICoded.ToCodings"/>
public IEnumerable<Coding> ToCodings() => [new(null, Value)];
public IReadOnlyCollection<Coding> ToCodings() => [new(null, Value)];
}
Loading