X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FCustomResponseEntityExceptionHandler.java;fp=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FCustomizedResponseEntityExceptionHandler.java;h=062d04fe3d34b64e3aa225d08802717848149b5e;hb=93a44cb851a49c923126f32016646860d104075c;hp=04162ab677c240d5287171845ba2459b0b3f5b09;hpb=6b1a3570356fd1a5624ea64db8d1f029ce0ab002;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomizedResponseEntityExceptionHandler.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomResponseEntityExceptionHandler.java
similarity index 81%
rename from webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomizedResponseEntityExceptionHandler.java
rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomResponseEntityExceptionHandler.java
index 04162ab6..062d04fe 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomizedResponseEntityExceptionHandler.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/CustomResponseEntityExceptionHandler.java
@@ -50,9 +50,10 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
  * https://www.springboottutorial.com/spring-boot-exception-handling-for-rest-services
  */
 @ControllerAdvice
-public class CustomizedResponseEntityExceptionHandler extends ResponseEntityExceptionHandler {
+public class CustomResponseEntityExceptionHandler extends ResponseEntityExceptionHandler {
 
-	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	// Superclass has "logger" that is exposed here, so use a different name
+	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	/**
 	 * Generates the response when a REST controller method takes an
@@ -68,10 +69,11 @@ public class CustomizedResponseEntityExceptionHandler extends ResponseEntityExce
 	 * @return A response entity with status code 502 plus some details in the body.
 	 */
 	@ExceptionHandler(HttpStatusCodeException.class)
-	public final ResponseEntity<?> handleHttpStatusCodeException(HttpStatusCodeException ex, WebRequest request) {
-		logger.warn("Request {} failed, status code {}", request.getDescription(false), ex.getStatusCode());
-		return new ResponseEntity<ErrorTransport>(
-				new ErrorTransport(ex.getRawStatusCode(), ex.getResponseBodyAsString(), ex), HttpStatus.BAD_GATEWAY);
+	public final ResponseEntity<ErrorTransport> handleHttpStatusCodeException(HttpStatusCodeException ex,
+			WebRequest request) {
+		log.warn("Request {} failed, status code {}", request.getDescription(false), ex.getStatusCode());
+		return new ResponseEntity<>(new ErrorTransport(ex.getRawStatusCode(), ex.getResponseBodyAsString(), ex),
+				HttpStatus.BAD_GATEWAY);
 	}
 
 }