Now remove the hack again.

FirelyTeam · Feb 1, 2024 · 6116a0f · 6116a0f
1 parent 3ce827d
commit 6116a0f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 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.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()