Merge pull request #2697 from FirelyTeam/feature/move-codeablereferen…

…ce-to-base CodeableReference was moved to base
FirelyTeam · Feb 2, 2024 · 5113eef · 5113eef
2 parents b78a984 + 6116a0f
commit 5113eef
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 201 deletions.
diff --git a/src/Hl7.Fhir.Base/Introspection/ModelInspector.cs b/src/Hl7.Fhir.Base/Introspection/ModelInspector.cs
@@ -295,8 +295,7 @@ private void extractBackbonesFromClasses(IEnumerable<Type> classTypes)
 
         public Type? GetTypeForFhirType(string name) => FindClassMapping(name) is { } mapping ? mapping.NativeType : null;
 
-        public bool IsBindable(string type) => FindClassMapping(type) is { } mapping && mapping.IsBindable || 
-                                               type == "CodeableReference";
+        public bool IsBindable(string type) => FindClassMapping(type) is { } mapping && mapping.IsBindable;
 
         public bool IsConformanceResource(string name) => GetTypeForFhirType(name) is { } type && IsConformanceResource(type);
 

diff --git a/src/Hl7.Fhir.R4B/Model/CodeableReference.cs → src/Hl7.Fhir.Base/Model/CodeableReference.cs b/src/Hl7.Fhir.R4B/Model/CodeableReference.cs → src/Hl7.Fhir.Base/Model/CodeableReference.cs
diff --git a/...r.R5/Model/Generated/CodeableReference.cs → ...Base/Model/Generated/CodeableReference.cs b/...r.R5/Model/Generated/CodeableReference.cs → ...Base/Model/Generated/CodeableReference.cs
diff --git a/src/Hl7.Fhir.Base/Model/Generated/_GeneratorLog.cs b/src/Hl7.Fhir.Base/Model/Generated/_GeneratorLog.cs
@@ -302,6 +302,7 @@
 // BackboneElement.cs
 // BackboneType.cs
 // CodeableConcept.cs
+// CodeableReference.cs
 // Coding.cs
 // ContactDetail.cs
 // ContactPoint.cs

diff --git a/src/Hl7.Fhir.ElementModel.R4B.Tests/ParseExtensionsTests.cs b/src/Hl7.Fhir.ElementModel.R4B.Tests/ParseExtensionsTests.cs
@@ -1,7 +1,6 @@
 using FluentAssertions;
 using Hl7.Fhir.ElementModel;
 using Hl7.Fhir.Model;
-using Hl7.Fhir.Specification.Terminology;
 using System.Collections.Generic;
 using Xunit;
 

diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CodeableReference.cs b/src/Hl7.Fhir.R4B/Model/Generated/CodeableReference.cs
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/_GeneratorLog.cs b/src/Hl7.Fhir.R4B/Model/Generated/_GeneratorLog.cs
@@ -283,7 +283,6 @@
 // Address.cs
 // Age.cs
 // Annotation.cs
-// CodeableReference.cs
 // Contributor.cs
 // Count.cs
 // DataRequirement.cs

diff --git a/src/Hl7.Fhir.R5/Model/CodeableReference.cs b/src/Hl7.Fhir.R5/Model/CodeableReference.cs
diff --git a/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs b/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs
@@ -308,7 +308,6 @@
 // Age.cs
 // Annotation.cs
 // Availability.cs
-// CodeableReference.cs
 // Contributor.cs
 // Count.cs
 // DataRequirement.cs

diff --git a/src/Hl7.Fhir.Support.Tests/Introspection/ModelInspectorTest.cs b/src/Hl7.Fhir.Support.Tests/Introspection/ModelInspectorTest.cs
@@ -6,6 +6,7 @@
  * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE
  */
 
+using FluentAssertions;
 using System.Reflection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Hl7.Fhir.Model;
@@ -37,6 +38,18 @@ public void TestResourceNameResolving()
             Assert.IsNull(noway);
         }
 
+        [TestMethod]
+        public void TestIsBindable()
+        {
+            ModelInspector.Base.IsBindable("string").Should().BeTrue();
+            ModelInspector.Base.IsBindable("uri").Should().BeTrue();
+            ModelInspector.Base.IsBindable("Quantity").Should().BeTrue();
+            ModelInspector.Base.IsBindable("Extension").Should().BeTrue();
+            ModelInspector.Base.IsBindable("Coding").Should().BeTrue();
+            ModelInspector.Base.IsBindable("CodeableConcept").Should().BeTrue();
+            ModelInspector.Base.IsBindable("CodeableReference").Should().BeTrue();
+            ModelInspector.Base.IsBindable("integer").Should().BeFalse();
+        }
 
         [TestMethod]
         public void TestAssemblyInspection()