Merge remote-tracking branch 'origin/master' into br-cs-merged

hapifhir · Mar 12, 2024 · e43bfab · e43bfab
2 parents a7bc396 + 7c76755
commit e43bfab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,5 +5,6 @@
         "**/.settings": true,
         "**/.factorypath": true
     },
-    "java.compile.nullAnalysis.mode": "disabled"
+    "java.compile.nullAnalysis.mode": "disabled",
+    "java.configuration.updateBuildConfiguration": "automatic"
 }
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/ig/ImplementationGuideR5OperationProvider.java b/src/main/java/ca/uhn/fhir/jpa/starter/ig/ImplementationGuideR5OperationProvider.java
@@ -35,9 +35,9 @@ public Parameters install(@OperationParam(name = "npmContent", min = 1, max = 1)
 
 
 	@Operation(name = "$uninstall", typeName = "ImplementationGuide")
-	public org.hl7.fhir.r4.model.Parameters uninstall(@OperationParam(name = "name", min = 1, max = 1) String name, @OperationParam(name = "version", min = 1, max = 1) String version) {
+	public Parameters uninstall(@OperationParam(name = "name", min = 1, max = 1) String name, @OperationParam(name = "version", min = 1, max = 1) String version) {
 
 		packageInstallerSvc.uninstall(new PackageInstallationSpec().setName(name).setVersion(version));
-		return new org.hl7.fhir.r4.model.Parameters();
+		return new Parameters();
 	}
 }