fix(fhir.rest): Use "handling=strict" and "handling=lenient" values...

...for the Prefer header on operations
b2ihealthcare · Oct 22, 2024 · 2e2fe38 · 2e2fe38
1 parent 14070fd
commit 2e2fe38
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 20 deletions.
diff --git a/...l.fhir.rest/src/com/b2international/snowowl/fhir/rest/FhirCodeSystemLookupController.java b/...l.fhir.rest/src/com/b2international/snowowl/fhir/rest/FhirCodeSystemLookupController.java
@@ -239,8 +239,11 @@ public Promise<ResponseEntity<byte[]>> lookup(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {

diff --git a/...fhir.rest/src/com/b2international/snowowl/fhir/rest/FhirCodeSystemSubsumesController.java b/...fhir.rest/src/com/b2international/snowowl/fhir/rest/FhirCodeSystemSubsumesController.java
@@ -301,8 +301,11 @@ public Promise<ResponseEntity<byte[]>> subsumes(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {
@@ -418,8 +421,11 @@ public Promise<ResponseEntity<byte[]>> subsumes(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {

diff --git a/....rest/src/com/b2international/snowowl/fhir/rest/FhirCodeSystemValidateCodeController.java b/....rest/src/com/b2international/snowowl/fhir/rest/FhirCodeSystemValidateCodeController.java
@@ -237,8 +237,11 @@ public Promise<ResponseEntity<byte[]>> validateCode(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {
@@ -470,8 +473,11 @@ public Promise<ResponseEntity<byte[]>> validateCode(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {

diff --git a/...hir.rest/src/com/b2international/snowowl/fhir/rest/FhirConceptMapTranslateController.java b/...hir.rest/src/com/b2international/snowowl/fhir/rest/FhirConceptMapTranslateController.java
@@ -237,8 +237,11 @@ public Promise<ResponseEntity<byte[]>> translate(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {
@@ -471,8 +474,11 @@ public Promise<ResponseEntity<byte[]>> translate(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {

diff --git a/...rest/src/com/b2international/snowowl/fhir/rest/FhirValueSetExpandOperationController.java b/...rest/src/com/b2international/snowowl/fhir/rest/FhirValueSetExpandOperationController.java
@@ -254,8 +254,11 @@ public Promise<ResponseEntity<byte[]>> expand(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {

diff --git a/...ir.rest/src/com/b2international/snowowl/fhir/rest/FhirValueSetValidateCodeController.java b/...ir.rest/src/com/b2international/snowowl/fhir/rest/FhirValueSetValidateCodeController.java
@@ -249,8 +249,11 @@ public Promise<ResponseEntity<byte[]>> validateCode(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {
@@ -495,8 +498,11 @@ public Promise<ResponseEntity<byte[]>> validateCode(
 		@RequestHeader(value = HttpHeaders.ACCEPT)
 		final String accept,
 
-		@Parameter(description = "Prefer header", schema = @Schema(allowableValues = {"strict", "lenient"}, defaultValue = "lenient"))
-		@RequestHeader(value = "Prefer", required = false)
+		@Parameter(description = "Prefer header", schema = @Schema(
+			allowableValues = { PREFER_HANDLING_STRICT, PREFER_HANDLING_LENIENT }, 
+			defaultValue = PREFER_HANDLING_LENIENT
+		))
+		@RequestHeader(value = PREFER, required = false)
 		final String prefer,
 
 		@Parameter(description = "Alternative response format", schema = @Schema(allowableValues = {