X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FCustomResponseEntityExceptionHandler.java;h=4c800d940e6feb413ecce98e5230eaf9b3548124;hb=9a688995681b92344824c990bb1d838d3cc7cfaa;hp=e75dfcb16243b933334872ec7ed573da369bd7d4;hpb=e0adfb63c5c6eb10bcea3bdf0d080e48aea38a51;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomResponseEntityExceptionHandler.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomResponseEntityExceptionHandler.java
index e75dfcb1..4c800d94 100644
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomResponseEntityExceptionHandler.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomResponseEntityExceptionHandler.java
@@ -21,6 +21,7 @@ package org.oransc.ric.portal.dashboard.controller;
 
 import java.lang.invoke.MethodHandles;
 
+import org.oransc.ric.portal.dashboard.exception.StatsManagerException;
 import org.oransc.ric.portal.dashboard.exception.UnknownInstanceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,7 +93,8 @@ public class CustomResponseEntityExceptionHandler extends ResponseEntityExceptio
 	}
 
 	/**
-	 * Logs a warning if an invalid RIC instance key is used.
+	 * Logs the error and generates a response when a REST controller method takes
+	 * an UnknownInstanceException, an invalid RIC instance key was used.
 	 * 
 	 * @param ex
 	 *                    The exception
@@ -107,4 +109,20 @@ public class CustomResponseEntityExceptionHandler extends ResponseEntityExceptio
 		return ResponseEntity.badRequest().body(getShortExceptionMessage(ex));
 	}
 
+	/**
+	 * Logs the error and generates a response when a REST controller method takes
+	 * an StatsManagerException.
+	 * 
+	 * @param ex
+	 *                    The exception
+	 * @param request
+	 *                    The original request
+	 * @return A response entity with status code 400 and an unstructured message.
+	 */
+	@ExceptionHandler({ StatsManagerException.class })
+	public final ResponseEntity<String> handleStatsManagerException(Exception ex, WebRequest request) {
+		log.warn("handleStatsManagerException: request {}, exception {}", request.getDescription(false), ex.toString());
+		return ResponseEntity.badRequest().body(getShortExceptionMessage(ex));
+	}
+
 }