#277: Added EnsureComputableValueSet operation.

src/main/java/org/opencds/cqf/tooling/Main.java

@@ -176,6 +176,19 @@
         - VmrToFhirTransformer
             - command: mvn exec: java -Dexec.args="-VmrToFhir -ifp=./src/test/resources/org/opencds/cqf/tooling/operation/VmrToFhir -op=./src/test/resources/org/opencds/cqf/tooling/operation/VmrToFhir/vMROutput.xml -e=xml"
             - this tooling transforms vMR data to FHIR data
+
+        - EnsureExecutableValueSet
+            - command: mvn exec: java -Dexec.args="-EnsureExecutableValueSet [-valuesetpath | -vsp] (-outputpath | -op) (-declarecpg | -cpg) (-force | -f)"
+            - This tooling generates an expansion if one is not present (and the compose consists only of includes without filters)
+            - The -cpg flag indicates whether to mark the value set as executable with CPG profile indicators
+            - The -force flag indicates that even if the value set has an expansion, this should recompute it
+
+        - EnsureComputableValueSet
+            - command: mvn exec: java -Dexec.args="-EnsureComputableValueSet [-valuesetpath | -vsp] (-outputpath | -op) (-declarecpg | -cpg) (-force | -f) (-skipversion | -sv)"
+            - This tooling infers a compose if one is not present (and there is an expansion)
+            - The -cpg flag indicates whether to mark the value set as computable with CPG profile indicators
+            - The -force flag indicates that even if the value set has a compose, this should reinfer it
+            - The -skipversion flag indicates that code system versions that are present in the expansion should not be expressed in the inferred compose
         */
 
 public class Main {

src/main/java/org/opencds/cqf/tooling/OperationFactory.java

@@ -38,6 +38,7 @@ static Operation createOperation(String operationName) {
             case "OpioidXlsxToValueSet":
                  return new OpioidValueSetGenerator();
             case "EnsureExecutableValueSet":
+            case "EnsureComputableValueSet":
                 return new EnsureExecutableValueSetOperation();
             case "ToJsonValueSetDb":
                 return new ToJsonValueSetDbOperation();

src/main/java/org/opencds/cqf/tooling/acceleratorkit/DictionaryCode.java

@@ -11,6 +11,20 @@
  */
 public class DictionaryCode {
 
+    private String id;
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        if (id == null) {
+            this.id = null;
+        }
+
+        if (id != null) {
+            this.id = id.replace((char) 160, (char) 32).trim();
+        }
+    }
+
     private String label;
     public String getLabel() {
         return this.label;