Merge pull request #969 from rhausam/upload-terminology

Fix client upload-terminology for r4.
hapifhir · Jun 27, 2018 · 1ec65d0 · 1ec65d0
2 parents 609cfc7 + b29cdc2
commit 1ec65d0
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/UploadTerminologyCommand.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/UploadTerminologyCommand.java
@@ -28,9 +28,6 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.hl7.fhir.dstu3.model.Parameters;
-import org.hl7.fhir.dstu3.model.StringType;
-import org.hl7.fhir.dstu3.model.UriType;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
@@ -82,10 +79,17 @@ public void run(CommandLine theCommandLine) throws ParseException {
 		IGenericClient client = super.newClient(theCommandLine);
 		IBaseParameters inputParameters;
 		if (ctx.getVersion().getVersion() == FhirVersionEnum.DSTU3) {
-			Parameters p = new Parameters();
-			p.addParameter().setName("url").setValue(new UriType(termUrl));
+			org.hl7.fhir.dstu3.model.Parameters p = new org.hl7.fhir.dstu3.model.Parameters();
+			p.addParameter().setName("url").setValue(new org.hl7.fhir.dstu3.model.UriType(termUrl));
 			for (String next : datafile) {
-				p.addParameter().setName("localfile").setValue(new StringType(next));
+				p.addParameter().setName("localfile").setValue(new org.hl7.fhir.dstu3.model.StringType(next));
+			}
+			inputParameters = p;
+		} else if (ctx.getVersion().getVersion() == FhirVersionEnum.R4) {
+			org.hl7.fhir.r4.model.Parameters p = new org.hl7.fhir.r4.model.Parameters();
+			p.addParameter().setName("url").setValue(new org.hl7.fhir.r4.model.UriType(termUrl));
+			for (String next : datafile) {
+				p.addParameter().setName("localfile").setValue(new org.hl7.fhir.r4.model.StringType(next));
 			}
 			inputParameters = p;
 		} else {