issue #424 - fixup Code subtypes

1. use `ValueSet.from` instead of `ValueSet.valueOf` which only works
with the ValueSet.name filed (e.g. ADDRESS vs Address)

2. fix FHIRGeneratorBenchmark to match FHIRParserBenchmark

3. if we get an unexpected ValueSet in the `of` static factory helper,
throw IllegalStateException instead of IllegalArgumentException since we
should never get there unless someone hand-edits the generated class

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>

Author: lmsurpre

fhir-benchmark/src/main/java/com/ibm/fhir/benchmark/FHIRGeneratorBenchmark.java

@@ -26,50 +26,59 @@
 import ca.uhn.fhir.context.FhirContext;
 
 public class FHIRGeneratorBenchmark {
+    static final Writer NOP_WRITER = BenchmarkUtil.createNOPWriter();
+    
+    @State(Scope.Thread)
+    public static class FHIRGenerators {
+        FHIRGenerator jsonGenerator = FHIRGenerator.generator(Format.JSON);
+        FHIRGenerator xmlGenerator = FHIRGenerator.generator(Format.XML);
+    }
+    
     @State(Scope.Benchmark)
     public static class FHIRGeneratorState {
-        public static final Writer NOP_WRITER = BenchmarkUtil.createNOPWriter();
+        FhirContext context;
+        Resource resource;
+        IBaseResource baseResource;
 
-        public FhirContext context;
-        public FHIRGenerator jsonGenerator;
-        public FHIRGenerator xmlGenerator;
-        public Resource resource;
-        public IBaseResource baseResource;
+        // JMH will inject the value into the annotated field before any Setup method is called.
+        @Param({"valuesets"})
+        public String exampleName;
 
         @Setup
-        public void setUp() throws Exception {            
-            context = FhirContext.forR4();
-            jsonGenerator = FHIRGenerator.generator(Format.JSON);
-            xmlGenerator = FHIRGenerator.generator(Format.XML);
+        public void setUp() throws Exception {
+            if (exampleName == null) {
+                System.err.println("exampleName is null; if you're in Eclipse then make sure annotation processing is on and you've ran 'mvn clean package'.");
+                System.exit(1);
+            }
+            
+            // us
+            String JSON_SPEC_EXAMPLE = BenchmarkUtil.getSpecExample(Format.JSON, exampleName);
             resource = FHIRParser.parser(Format.JSON).parse(new StringReader(JSON_SPEC_EXAMPLE));
+            
+            // HAPI
+            context = FhirContext.forR4();
             baseResource = context.newJsonParser().parseResource(new StringReader(JSON_SPEC_EXAMPLE));
         }
-        
-        @Param({"test"})
-        public String JSON_SPEC_EXAMPLE;
-        
-        @Param({"test"})
-        public String XML_SPEC_EXAMPLE;
     }
 
     @Benchmark
-    public void benchmarkJsonGenerator(FHIRGeneratorState state) throws Exception {
-        state.jsonGenerator.generate(state.resource, FHIRGeneratorState.NOP_WRITER);
+    public void benchmarkJsonGenerator(FHIRGenerators generators, FHIRGeneratorState state) throws Exception {
+        generators.jsonGenerator.generate(state.resource, NOP_WRITER);
     }
 
     @Benchmark
-    public void benchmarkXMLGenerator(FHIRGeneratorState state) throws Exception {
-        state.xmlGenerator.generate(state.resource, FHIRGeneratorState.NOP_WRITER);
+    public void benchmarkXMLGenerator(FHIRGenerators generators, FHIRGeneratorState state) throws Exception {
+        generators.xmlGenerator.generate(state.resource, NOP_WRITER);
     }
 
     @Benchmark
     public void benchmarkHAPIJsonGenerator(FHIRGeneratorState state) throws Exception {
-        state.context.newJsonParser().encodeResourceToWriter(state.baseResource, FHIRGeneratorState.NOP_WRITER);
+        state.context.newJsonParser().encodeResourceToWriter(state.baseResource, NOP_WRITER);
     }
 
     @Benchmark
     public void benchmarkHAPIXMLGenerator(FHIRGeneratorState state) throws Exception {
-        state.context.newXmlParser().encodeResourceToWriter(state.baseResource, FHIRGeneratorState.NOP_WRITER);
+        state.context.newXmlParser().encodeResourceToWriter(state.baseResource, NOP_WRITER);
     }
 
     public static void main(String[] args) throws Exception {

fhir-benchmark/src/main/java/com/ibm/fhir/benchmark/FHIRParserBenchmark.java

@@ -28,15 +28,15 @@
 public class FHIRParserBenchmark {
     @State(Scope.Thread)
     public static class FHIRParsers {
-        public FHIRParser jsonParser = FHIRParser.parser(Format.JSON);
-        public FHIRParser xmlParser = FHIRParser.parser(Format.XML);
+        FHIRParser jsonParser = FHIRParser.parser(Format.JSON);
+        FHIRParser xmlParser = FHIRParser.parser(Format.XML);
     }
 
     @State(Scope.Benchmark)
     public static class FHIRParserState {
-        public FhirContext context;
-        public String JSON_SPEC_EXAMPLE;
-        public String XML_SPEC_EXAMPLE;
+        FhirContext context;
+        String JSON_SPEC_EXAMPLE;
+        String XML_SPEC_EXAMPLE;
 
         // JMH will inject the value into the annotated field before any Setup method is called.
         @Param({"valuesets"})

fhir-model/src/main/java/com/ibm/fhir/model/type/code/AccountStatus.java

@@ -61,20 +61,20 @@ public static AccountStatus of(ValueSet value) {
         case UNKNOWN:
             return UNKNOWN;
         default:
-            throw new IllegalArgumentException(value.name());
+            throw new IllegalStateException(value.name());
         }
     }
 
     public static AccountStatus of(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static String string(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static Code code(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     @Override

fhir-model/src/main/java/com/ibm/fhir/model/type/code/ActionCardinalityBehavior.java

@@ -40,20 +40,20 @@ public static ActionCardinalityBehavior of(ValueSet value) {
         case MULTIPLE:
             return MULTIPLE;
         default:
-            throw new IllegalArgumentException(value.name());
+            throw new IllegalStateException(value.name());
         }
     }
 
     public static ActionCardinalityBehavior of(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static String string(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static Code code(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     @Override

fhir-model/src/main/java/com/ibm/fhir/model/type/code/ActionConditionKind.java

@@ -47,20 +47,20 @@ public static ActionConditionKind of(ValueSet value) {
         case STOP:
             return STOP;
         default:
-            throw new IllegalArgumentException(value.name());
+            throw new IllegalStateException(value.name());
         }
     }
 
     public static ActionConditionKind of(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static String string(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static Code code(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     @Override

fhir-model/src/main/java/com/ibm/fhir/model/type/code/ActionGroupingBehavior.java

@@ -47,20 +47,20 @@ public static ActionGroupingBehavior of(ValueSet value) {
         case SENTENCE_GROUP:
             return SENTENCE_GROUP;
         default:
-            throw new IllegalArgumentException(value.name());
+            throw new IllegalStateException(value.name());
         }
     }
 
     public static ActionGroupingBehavior of(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static String string(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static Code code(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     @Override

fhir-model/src/main/java/com/ibm/fhir/model/type/code/ActionParticipantType.java

@@ -54,20 +54,20 @@ public static ActionParticipantType of(ValueSet value) {
         case DEVICE:
             return DEVICE;
         default:
-            throw new IllegalArgumentException(value.name());
+            throw new IllegalStateException(value.name());
         }
     }
 
     public static ActionParticipantType of(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static String string(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static Code code(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     @Override

fhir-model/src/main/java/com/ibm/fhir/model/type/code/ActionPrecheckBehavior.java

@@ -40,20 +40,20 @@ public static ActionPrecheckBehavior of(ValueSet value) {
         case NO:
             return NO;
         default:
-            throw new IllegalArgumentException(value.name());
+            throw new IllegalStateException(value.name());
         }
     }
 
     public static ActionPrecheckBehavior of(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static String string(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static Code code(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     @Override

fhir-model/src/main/java/com/ibm/fhir/model/type/code/ActionRelationshipType.java

@@ -89,20 +89,20 @@ public static ActionRelationshipType of(ValueSet value) {
         case AFTER_END:
             return AFTER_END;
         default:
-            throw new IllegalArgumentException(value.name());
+            throw new IllegalStateException(value.name());
         }
     }
 
     public static ActionRelationshipType of(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static String string(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static Code code(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     @Override

fhir-model/src/main/java/com/ibm/fhir/model/type/code/ActionRequiredBehavior.java

@@ -47,20 +47,20 @@ public static ActionRequiredBehavior of(ValueSet value) {
         case MUST_UNLESS_DOCUMENTED:
             return MUST_UNLESS_DOCUMENTED;
         default:
-            throw new IllegalArgumentException(value.name());
+            throw new IllegalStateException(value.name());
         }
     }
 
     public static ActionRequiredBehavior of(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static String string(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     public static Code code(java.lang.String value) {
-        return of(ValueSet.valueOf(value));
+        return of(ValueSet.from(value));
     }
 
     @Override