fix(fhir): report ECL syntax error details in FHIR operation outcomes

b2ihealthcare · May 7, 2024 · 3b62aaf · 3b62aaf
1 parent e9d1866
commit 3b62aaf
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...l.snowowl.fhir.rest/src/com/b2international/snowowl/fhir/rest/AbstractFhirController.java b/...l.snowowl.fhir.rest/src/com/b2international/snowowl/fhir/rest/AbstractFhirController.java
@@ -237,8 +237,7 @@ protected static <T extends Resource> T toFhirResource(
 			return fhirResource.as(resourceClass);
 
 		} catch (FHIRParserException e) {
-			throw new BadRequestException(String.format("Failed to parse request body as a complete %s resource.", 
-				resourceClass.getSimpleName()));
+			throw new BadRequestException(String.format("Failed to parse request body as a complete %s resource: %s", resourceClass.getSimpleName(), e.getMessage()));
 		}
 	}
 
@@ -323,6 +322,14 @@ protected static ResponseEntity<byte[]> toResponseEntity(
 	    }
 	}
 
+	@ExceptionHandler
+	@ResponseStatus(HttpStatus.BAD_REQUEST)
+	public @ResponseBody OperationOutcome handle(final SyntaxException ex) {
+    	FhirException fhirException = FhirException.createFhirError(ex.getMessage(), OperationOutcomeCode.MSG_BAD_SYNTAX);
+    	fhirException.withAdditionalInfo(ex.getAdditionalInfo());
+    	return fhirException.toOperationOutcome();
+	}
+
 	@ExceptionHandler
 	@ResponseStatus(HttpStatus.BAD_REQUEST)
 	public @ResponseBody OperationOutcome handle(final ValidationException ex) {