From a47b7685cc30449f7490089c4b8936b0c23e32ed Mon Sep 17 00:00:00 2001
From: AJoshi19 <ajoshi19@slb.com>
Date: Wed, 15 Jan 2025 15:07:15 -0600
Subject: [PATCH] wrapper around warning slash error
---
.../search/middleware/GlobalExceptionMapper.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/search-core/src/main/java/org/opengroup/osdu/search/middleware/GlobalExceptionMapper.java b/search-core/src/main/java/org/opengroup/osdu/search/middleware/GlobalExceptionMapper.java
index 6be3e5dbf..c68862b8a 100644
--- a/search-core/src/main/java/org/opengroup/osdu/search/middleware/GlobalExceptionMapper.java
+++ b/search-core/src/main/java/org/opengroup/osdu/search/middleware/GlobalExceptionMapper.java
@@ -141,17 +141,13 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler {
String exceptionMsg = e.getError().getMessage();
if (canLogException(e)) {
- if (e.getError().getCode() > 499) {
- this.jaxRsDpsLogger.error(exceptionMsg, e);
- } else {
- this.jaxRsDpsLogger.warning(exceptionMsg, e);
- }
+ logErrorOrWarning(exceptionMsg, e);
// log suppressed exception from Elastic's ResponseException if any
this.logSuppressedElasticException(e);
} else {
String loggingMsg = exceptionMsg.length() < configurationProperties.getMaxExceptionLogMessageLength() ? exceptionMsg : exceptionMsg.substring(0, configurationProperties.getMaxExceptionLogMessageLength());
- this.jaxRsDpsLogger.error(loggingMsg, new AppException(e.getError().getCode(), e.getError().getReason(), loggingMsg));
+ logErrorOrWarning(loggingMsg, new AppException(e.getError().getCode(), e.getError().getReason(), loggingMsg));
}
// Support for non-standard HttpStatus Codes
@@ -163,6 +159,14 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler {
}
}
+ private void logErrorOrWarning(String exceptionMsg, AppException e) {
+ if (e.getError().getCode() > 499) {
+ this.jaxRsDpsLogger.error(exceptionMsg, e);
+ } else {
+ this.jaxRsDpsLogger.warning(exceptionMsg, e);
+ }
+ }
+
private boolean canLogException(AppException e) {
if (e.getMessage().length() > configurationProperties.getMaxExceptionLogMessageLength()) {
return false;
--
GitLab