Merge branch 'EA-3566_externalization_log2j_config' into

EA-3567-new-error-responses
europeana · Oct 9, 2023 · 94b909a · 94b909a
2 parents 95c1287 + 9eeb3d5
commit 94b909a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...-web/src/main/java/eu/europeana/api/translation/web/exception/GlobalExceptionHandler.java b/...-web/src/main/java/eu/europeana/api/translation/web/exception/GlobalExceptionHandler.java
@@ -65,7 +65,9 @@ private ResponseEntity<EuropeanaApiErrorResponse> buildApiErrorResponse(European
             .setError(e.getResponseStatus().getReasonPhrase())
             .setMessage(e.doExposeMessage() ? buildResponseMessage(e, i18nKey, i18NParams) : null)
             // code only included in JSON if a value is set in exception
-            .setCode(e.getErrorCode()).build();
+            .setCode(e.getErrorCode())
+            .setSeeAlso(getSeeAlso())
+            .build();
     return ResponseEntity.status(e.getResponseStatus()).headers(createHttpHeaders(httpRequest))
         .body(response);
   }
@@ -95,7 +97,9 @@ public ResponseEntity<EuropeanaApiErrorResponse> handleCommonHttpException(
             .setError(e.getStatus().getReasonPhrase())
             .setMessage( i18nService.getMessage(e.getI18nKey(), e.getI18nParams()))
             // code only included in JSON if a value is set in exception
-            .setCode(e.getI18nKey()).build();
+            .setCode(e.getI18nKey())
+            .setSeeAlso(getSeeAlso())
+            .build();
     return ResponseEntity.status(e.getStatus()).headers(createHttpHeaders(httpRequest))
         .body(response);
   }
@@ -111,7 +115,10 @@ public ResponseEntity<EuropeanaApiErrorResponse> handleNoHandlerFoundException(
     EuropeanaApiErrorResponse response =
         new EuropeanaApiErrorResponse.Builder(httpRequest, e, stackTraceEnabled())
             .setStatus(HttpStatus.NOT_FOUND.value())
-            .setError(HttpStatus.NOT_FOUND.getReasonPhrase()).setMessage(e.getMessage()).build();
+            .setError(HttpStatus.NOT_FOUND.getReasonPhrase())
+            .setMessage(e.getMessage())
+            .setSeeAlso(getSeeAlso())
+            .build();
     return ResponseEntity.status(HttpStatus.NOT_FOUND.value())
         .contentType(MediaType.APPLICATION_JSON).body(response);
   }

diff --git a/translation-web/src/main/resources/application.properties b/translation-web/src/main/resources/application.properties
@@ -29,6 +29,7 @@ server.port = 8080
 server.error.include-message=always
 server.error.include-stacktrace=on_param
 server.error.include-exception=false
+server.error.see-also=https://pro.europeana.eu/page/apis
 
 #  compression:
 #    enabled: true