Merge pull request #5 from FirelyTeam/feature/improve-valueset-gen

Used the new features in the fhir model information (experimental, st…
microsoft · Jul 28, 2020 · 01f1b91 · 01f1b91
2 parents bdf8035 + 91c13a9
commit 01f1b91
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/Microsoft.Health.Fhir.SpecManager/Language/CSharpFirely.cs b/src/Microsoft.Health.Fhir.SpecManager/Language/CSharpFirely.cs
@@ -317,11 +317,6 @@ private void WriteSearchParameters()
 
                 foreach (FhirSearchParam sp in complex.SearchParameters.Values.OrderBy(s => s.Name))
                 {
-                    if (sp.IsExperimental)
-                    {
-                        continue;
-                    }
-
                     string description;
 
                     if ((!string.IsNullOrEmpty(sp.Description)) &&
@@ -686,7 +681,7 @@ private void WriteCommonValueSets()
         {
             HashSet<string> usedEnumNames = new HashSet<string>();
 
-            string filename = Path.Combine(_exportDirectory, "Generated", "Template-Bindings.cs");
+            string filename = Path.Combine(_exportDirectory, "Generated", "CommonValueSets.cs");
 
             using (FileStream stream = new FileStream(filename, FileMode.Create))
             using (ExportStreamWriter writer = new ExportStreamWriter(stream))
@@ -703,9 +698,21 @@ private void WriteCommonValueSets()
                     {
                         if (vs.ReferencedByComplexes.Count < 2)
                         {
+                            /* ValueSets that are used in a single POCO are generated as a nested enum inside that
+                             * POCO, not here in the shared valuesets */
                             continue;
                         }
-
+
+                        if (vs.StrongestBinding != FhirElement.ElementDefinitionBindingStrength.Required)
+                        {
+                            /* Since required bindings cannot be extended, those are the only bindings that
+                               can be represented using enums in the POCO classes (using <c>Code&lt;T&gt;</c>). All other coded members
+                               use <c>Code</c>, <c>Coding</c> or <c>CodeableConcept</c>.
+                               Consequently, we only need to generate enums for valuesets that are used as
+                               required bindings anywhere in the datamodel. */
+                            continue;
+                        }
+
                         if (_exclusionSet.Contains(vs.URL))
                         {
                             continue;