Forward merge SDK5 into SDK6 #3314

Kasdejong · 2025-10-09T11:53:48Z

Description

Merged our SDK5 changes since rc1 into the SDK6 branch, this includes:

Brians changes to FhirPath
Some changes in the snapshot generator
Changes to the parsers (whitespace handling)

…ant (that's the base class of identifier) Permits being able to differentiate in the expression tree between them.

only has minor impact on expression compilation, and no effect on runtime if no debugger injected.

Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

…idation Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Start development phase 5.12.2

Only inject the debugger break when in debug mode. This code should never be hit, so excluding the break is good. Intended to wake the developer if it ever hits here, as that means a new Expression type has been added that doesn't derived from one of the existing ones. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…e into the compiled expression

…variable processing

… show in the debug output what steps the evaluation took.

…ebugger

…them immediately Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

…n run to prevent state reuse across operations Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

- Add new overloads to BaseFhirXmlPocoSerializer.Serialize() and SerializeToString() that take Func<SerializationFilter> factory parameter - Mark existing methods taking SerializationFilter as obsolete with clear migration guidance - Update internal calls in PocoSerializationEngine_Xml to use new thread-safe methods - Add comprehensive tests verifying factory methods work correctly and produce identical output to obsolete methods - Ensure filter factories create fresh instances per call for thread safety Addresses XML serialization thread-safety concerns similar to JSON serialization fixes Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Unified duplicate MatchesVersion implementations across ArtifactSummaryExtensions and InMemoryResourceResolver by moving the logic to a public static method on the Canonical class. This eliminates code duplication and provides a centralized, reusable canonical version matching utility. - Added Canonical.MatchesVersion() as public static method - Updated all three implementations to use Canonical.MatchesVersion() - Removed duplicate private MatchesVersion methods - Maintains full backward compatibility Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

…hen Value is null Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

…al argument to the existing function. (from a usage side, looks the same)

Fix mapping and example inheritance during snapshot generation with suppress extension support across all FHIR versions

Integrate Java validator logic for primitive element merging without duplicating existing code

… json during serialization

…whitespace Add TrimWhiteSpacesInJson to trim string values

Also erase contentRef in STU3

…it tests.

…orAnnotation.

…r of parameters (specifically for sort/coalesce)

…y of the fhirpath specification

…into feature/BP-fhirpath-debugger

…ing RemoveAllSnapshotGeneratorAnnotations. Added fix and unit test for STU3.

…nit test.

--- updated-dependencies: - dependency-name: BenchmarkDotNet dependency-version: 0.15.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

…rks/BenchmarkDotNet-0.15.4 Bump BenchmarkDotNet from 0.15.2 to 0.15.4

Add fhirpath support for coalesce and sort

…ference

…te-content-reference Added check on absolute content reference when expanding elements

…rely-net-sdk into bugfix/append-text

Bugfix/append text

# Conflicts: # release-notes.md # src/Hl7.Fhir.Base/ElementModel/Types/Ucum.cs # src/Hl7.Fhir.Base/FhirPath/EvaluationContext.cs # src/Hl7.Fhir.Base/FhirPath/Expressions/Closure.cs # src/Hl7.Fhir.Base/FhirPath/Expressions/DynaDispatcher.cs # src/Hl7.Fhir.Base/FhirPath/Expressions/EvaluatorVisitor.cs # src/Hl7.Fhir.Base/FhirPath/Expressions/Invokee.cs # src/Hl7.Fhir.Base/FhirPath/Expressions/SymbolTableInit.cs # src/Hl7.Fhir.Base/FhirPath/FhirPathCompiler.cs # src/Hl7.Fhir.Base/Model/Canonical.cs # src/Hl7.Fhir.Base/Model/Date-comparators.cs # src/Hl7.Fhir.Base/Model/FhirDateTime-comparators.cs # src/Hl7.Fhir.Base/Model/Instant-comparators.cs # src/Hl7.Fhir.Base/Model/Time-comparators.cs # src/Hl7.Fhir.Base/Serialization/BaseFhirJsonPocoSerializer.cs # src/Hl7.Fhir.Base/Serialization/BaseFhirParser.cs # src/Hl7.Fhir.Base/Serialization/BaseFhirXmlPocoSerializer.cs # src/Hl7.Fhir.Base/Serialization/CommonFhirJsonSerializer.cs # src/Hl7.Fhir.Base/Serialization/FhirJsonParsingSettings.cs # src/Hl7.Fhir.Base/Serialization/FhirJsonPocoSerializerSettings.cs # src/Hl7.Fhir.Base/Serialization/FhirJsonSerializationSettings.cs # src/Hl7.Fhir.Base/Serialization/FilterPredicateExtensions.cs # src/Hl7.Fhir.Base/Serialization/ParserSettings.cs # src/Hl7.Fhir.Base/Serialization/SerializationFilter.cs # src/Hl7.Fhir.Base/Serialization/SerializerSettings.cs # src/Hl7.Fhir.Base/Serialization/engine/PocoSerializationEngine_Xml.cs # src/Hl7.Fhir.Base/Specification/Snapshot/SnapshotGeneratorExtensions.cs # src/Hl7.Fhir.Base/Specification/Source/InMemoryResourceResolver.cs # src/Hl7.Fhir.Conformance/Specification/Snapshot/ElementDefnMerger.cs # src/Hl7.Fhir.STU3/Specification/Snapshot/ElementDefnMerger.cs # src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorAnnotations.cs # src/Hl7.Fhir.Shared.Tests/Validation/ValidatePatient.cs # src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorAnnotations.cs # src/Hl7.Fhir.Shims.STU3AndUp/Model/ModelInfo.cs # src/Hl7.Fhir.Specification.Shared.Tests/Source/ResourceResolverTests.cs # src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/FhirXmlSerializationTests.cs # src/Hl7.Fhir.Support.Poco.Tests/Serialization/SummaryFilterThreadSafetyTests.cs # src/firely-net-sdk.props

andrzejskowronski · 2025-10-10T07:30:30Z

src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorAnnotations.cs

+#pragma warning disable CS0618 // Type or member is obsolete
+            foreach (var child in element.Children())
+#pragma warning restore CS0618 // Type or member is obsolete


Shouldn't this use EnumerateElements?

andrzejskowronski · 2025-10-10T07:31:38Z

src/Hl7.Fhir.Base/Serialization/elementmodel/FhirJsonNode.cs

    public partial class FhirJsonNode : ISourceNode, IResourceTypeSupplier, IAnnotated, IExceptionSource
    {
-        internal FhirJsonNode(JObject root, string nodeName, FhirJsonParsingSettings settings = null)
+        internal FhirJsonNode(JObject root, string nodeName, FhirJsonParsingSettings settings = null, bool preserveWhiteSpaceInValues = false)


I think here it should go into the FhirJsonParsingSettings (as it is in SDK5), otherwise it will not be publicly accessible option.

andrzejskowronski · 2025-10-10T07:42:33Z

src/Hl7.Fhir.Base/Serialization/elementmodel/FhirJsonBuilder.cs

 namespace Hl7.Fhir.Serialization
 {
-    internal class FhirJsonBuilder : IExceptionSource
+    internal class FhirJsonBuilder(bool preserveWhiteSpaceInValues = false) : IExceptionSource


We'll also need to update the callsites at SourceNodeExtensions.Conversions to allow for this argument to be passed, since the type itself is internal.

brianpos and others added 30 commits June 24, 2025 21:16

Functions and child properties the name is an identifier, not a const…

d24d890

…ant (that's the base class of identifier) Permits being able to differentiate in the expression tree between them.

ChildExpression name is an identifier (derived from constant)

269c6e3

Initial draft of injecting a debug tracer.

4d45c55

only has minor impact on expression compilation, and no effect on runtime if no debugger injected.

Merge branch 'develop' into feature/BP-fhirpath-debugger

21539a4

Initial plan

e8bd31b

Initial plan

e34f676

Add factory pattern for thread-safe serialization filters

8ec0099

Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Implement canonical version matching for partial versions in FHIR val…

6864987

…idation Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Complete thread-safe serialization filter implementation

c6c5a91

Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

bump version to 5.12.2

30c7131

Merge pull request #3220 from FirelyTeam/release/5.12.1

6352fd3

Start development phase 5.12.2

Complete the external surface for how to "inject" the tracing delegat…

cf9458b

…e into the compiled expression

Include the position information for the standard extension/valueset …

8cf189b

…variable processing

Use an interface that has the function rather than a delegate.

bea44d0

rename debugtracer file

ba521f3

Include a unit test for the debug tracer

c0530a4

Tweak some other fhirpath unit tests to use the diagnostics tracer to…

a84bc97

… show in the debug output what steps the evaluation took.

Merge remote-tracking branch 'hl7/develop' into feature/BP-fhirpath-d…

bdfc37f

…ebugger

Merge branch 'develop' into copilot/fix-3214

559cf62

Refactor obsolete filter methods to call factory methods and execute …

ca432f4

…them immediately Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Fix factory methods to create fresh filter instances per serializatio…

4b28378

…n run to prevent state reuse across operations Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Merge branch 'develop' into copilot/fix-3216

6192161

Initial plan

f6d6596

Fix NullReferenceException in primitive types GetHashCode() methods w…

2d2017a

…hen Value is null Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Include exact test case from original issue #3171 in validation test

20c8d81

Co-authored-by: ewoutkramer <2276305+ewoutkramer@users.noreply.github.com>

Fix encoding issues

e3d0a24

Change to a few overload to the function rather than adding an option…

7dd77e9

…al argument to the existing function. (from a usage side, looks the same)

mmsmits and others added 28 commits September 2, 2025 14:54

Merge pull request #3270 from FirelyTeam/copilot/fix-2873

edc1859

Fix mapping and example inheritance during snapshot generation with suppress extension support across all FHIR versions

Merge branch 'develop' into copilot/fix-3211

097ffb5

Merge pull request #3271 from FirelyTeam/copilot/fix-3211

f5500fb

Integrate Java validator logic for primitive element merging without duplicating existing code

add TrimWhiteSpacesInJson setting to optionally trim string values in…

2a9ef82

… json during serialization

Merge pull request #3273 from mikemassa84/feature/optional_trim_json_…

3a3ae14

…whitespace Add TrimWhiteSpacesInJson to trim string values

Also erase contentRef in STU3

bb1ef9b

Merge pull request #3274 from FirelyTeam/fix/3177-stu3

649bacb

Also erase contentRef in STU3

Added check to prevent appending text (using ...) more than once + un…

c8efbf5

…it tests.

Added RemoveAllSnapshotGeneratorAnnotations and RemoveSnapshotGenerat…

43fb7e4

…orAnnotation.

Introduce support for CallSignatures with a dynamic or variable numbe…

b037890

…r of parameters (specifically for sort/coalesce)

Include support for the newly approved coalesce and sort functionalit…

720517e

…y of the fhirpath specification

Merge branch 'develop' of https://github.com/FirelyTeam/firely-net-sdk …

3e42892

…into feature/BP-fhirpath-debugger

Moved appendTextIssueTest to shared tests. Fixed not recursively call…

d495e2b

…ing RemoveAllSnapshotGeneratorAnnotations. Added fix and unit test for STU3.

Code cleanup

fd0b7c0

Added check on absolute content reference when expanding elements + u…

5b18c05

…nit test.

Bump BenchmarkDotNet from 0.15.2 to 0.15.4

6924799

--- updated-dependencies: - dependency-name: BenchmarkDotNet dependency-version: 0.15.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #3292 from FirelyTeam/dependabot/nuget/src/Benchma…

b9c2fa3

…rks/BenchmarkDotNet-0.15.4 Bump BenchmarkDotNet from 0.15.2 to 0.15.4

Merge branch 'develop' into feature/BP-sort-coalesce

3c03d9f

Merge pull request #3287 from FirelyTeam/feature/BP-sort-coalesce

1168147

Add fhirpath support for coalesce and sort

Merge branch 'develop' into bugfix/expand-element-absolute-content-re…

94078a5

…ference

Merge branch 'develop' into bugfix/append-text

80c6f9f

Merge pull request #3291 from FirelyTeam/bugfix/expand-element-absolu…

fa6106c

…te-content-reference Added check on absolute content reference when expanding elements

Merge branch 'develop' into bugfix/append-text

a4539e3

Merge branch 'bugfix/append-text' of https://github.com/FirelyTeam/fi…

52437bf

…rely-net-sdk into bugfix/append-text

Merge pull request #3281 from FirelyTeam/bugfix/append-text

3669058

Bugfix/append text

wip

1497277

completed forward merge

6398397

Kasdejong requested a review from andrzejskowronski October 9, 2025 11:54

andrzejskowronski requested changes Oct 10, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Forward merge SDK5 into SDK6 #3314

Forward merge SDK5 into SDK6 #3314

Uh oh!

Kasdejong commented Oct 9, 2025 •

edited

Loading

Uh oh!

andrzejskowronski Oct 10, 2025

Uh oh!

andrzejskowronski Oct 10, 2025

Uh oh!

andrzejskowronski Oct 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Forward merge SDK5 into SDK6 #3314

Are you sure you want to change the base?

Forward merge SDK5 into SDK6 #3314

Uh oh!

Conversation

Kasdejong commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Uh oh!

andrzejskowronski Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

andrzejskowronski Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

andrzejskowronski Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Kasdejong commented Oct 9, 2025 •

edited

Loading