more work

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/profilemodel/gen/ProfileExample.java

@@ -2,6 +2,7 @@ package org.hl7.fhir.r5.profilemodel.gen;
 
 import org.hl7.fhir.r5.context.IWorkerContext;
 import org.hl7.fhir.r5.model.CodeType;
+import org.hl7.fhir.r5.model.Enumerations.ObservationStatus;
 import org.hl7.fhir.r5.model.Observation;
 import org.hl7.fhir.r5.profilemodel.PEBuilder;
 import org.hl7.fhir.r5.profilemodel.PEBuilder.PEElementPropertiesPolicy;
@@ -11,23 +12,81 @@ import org.hl7.fhir.r5.profilemodel.PEInstance;
  * This class is a manually written example of the code that a POJO code
  * generator for Profiles would produce 
  * 
+ * Should you generate code? If you can bind at compile time, then you should. 
+ * If you can't - and most systems can't, given the nature of profiles, then 
+ * you should use PEInstance directly
+ * 
  * @author grahamegrieve
  *
  */
 public class ProfileExample extends PEGeneratedBase {
 
+  public enum LOINCCodesForCholesterolInSerumPlasma {
+    L14647_2, L2093_3, L35200_5, L9342_7;
+    
+    public String getCode() {
+      switch (this) {
+      case L14647_2: return "14647-2";
+      case L2093_3: return "2093-3";
+      case L35200_5: return "35200-5";
+      case L9342_7: return "9342-7";
+      }
+      return null;
+    }
+    
+    public String getDisplay() {
+      switch (this) {
+      case L14647_2: return "Cholesterol [Moles/Volume]";
+      case L2093_3: return "Cholesterol [Mass/Volume]";
+      case L35200_5: return "Cholesterol [Mass Or Moles/Volume]";
+      case L9342_7: return "Cholesterol [Percentile]";
+      }
+      return null;
+    }
+    
+    public static LOINCCodesForCholesterolInSerumPlasma fromCode(String code) {
+      if (code != null) {
+        switch (code) {
+        case "14647-2": return L14647_2;
+        case "2093-3": return L2093_3;
+        case "35200-5": return L35200_5;
+        case "9342-7": return L9342_7;
+        }
+      }
+      return null;
+    }
+  }
+
   public ProfileExample(IWorkerContext context, Observation observation) {
     super();
     PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION_ID, true);
     instance = builder.buildPEInstance("http://hl7.org/fhir/test/StructureDefinition/pe-profile1", "0.1", observation);
   }
   
+  /** 
+   * this is public for testing purposes, but you generally shouldn't use it. If you do, make 
+   * sure the parameters are (PEElementPropertiesPolicy.EXTENSION_ID, true) when building the PEBuilder
+   * 
+   * @param instance
+   */
+  public ProfileExample(PEInstance instance) {
+    super();
+    this.instance = instance;
+  }
+  
+  /** 
+   * @return fixed value "final"
+   */
+  public ObservationStatus getStatus() {
+    return ObservationStatus.FINAL;
+  }
+  
   /**
    * Extension http://hl7.org/fhir/test/StructureDefinition/pe-extension-simple, type code
    * @return
    */
-  public CodeType getSimple() {
+  public LOINCCodesForCholesterolInSerumPlasma getSimple() {
-    return (CodeType) instance.forceChild("simple").asDataType();
+    return LOINCCodesForCholesterolInSerumPlasma.fromCode(((CodeType) instance.forceChild("simple").asDataType()).primitiveValue());
   }
   
   public boolean hasSimple() {

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/profiles/PETests.java

@@ -7,11 +7,14 @@ import org.hl7.fhir.r5.context.IWorkerContext;
 import org.hl7.fhir.r5.formats.IParser.OutputStyle;
 import org.hl7.fhir.r5.formats.JsonParser;
 import org.hl7.fhir.r5.model.Coding;
+import org.hl7.fhir.r5.model.Enumerations.ObservationStatus;
 import org.hl7.fhir.r5.model.Observation;
 import org.hl7.fhir.r5.model.Resource;
 import org.hl7.fhir.r5.profilemodel.PEDefinition;
 import org.hl7.fhir.r5.profilemodel.PEInstance;
 import org.hl7.fhir.r5.profilemodel.PEType;
+import org.hl7.fhir.r5.profilemodel.gen.ProfileExample;
+import org.hl7.fhir.r5.profilemodel.gen.ProfileExample.LOINCCodesForCholesterolInSerumPlasma;
 import org.hl7.fhir.r5.profilemodel.PEBuilder;
 import org.hl7.fhir.r5.profilemodel.PEBuilder.PEElementPropertiesPolicy;
 import org.hl7.fhir.r5.profilemodel.PEInstance.PEInstanceDataKind;
@@ -346,6 +349,11 @@ public class PETests {
     Assertions.assertEquals("TestProfile.complex.slice2[0]", slice2.getPath());
     Assertions.assertEquals(PEInstanceDataKind.Primitive, slice2.getDataKind());
     Assertions.assertEquals("A string value", slice2.getPrimitiveAsString());
+    
+    
+    ProfileExample ex = new ProfileExample(obs);
+    Assertions.assertEquals(ObservationStatus.FINAL, ex.getStatus());
+    Assertions.assertEquals(LOINCCodesForCholesterolInSerumPlasma.L14647_2, ex.getSimple());
   }