Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / java / org / onap / vid / controller / VidRestrictedBaseController.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/VidRestrictedBaseController.java b/vid-app-common/src/main/java/org/onap/vid/controller/VidRestrictedBaseController.java
similarity index 92%
rename from vid-app-common/src/main/java/org/onap/vid/controllers/VidRestrictedBaseController.java
rename to vid-app-common/src/main/java/org/onap/vid/controller/VidRestrictedBaseController.java
index b520bc0..e13cf45 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/controllers/VidRestrictedBaseController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/VidRestrictedBaseController.java
@@ -1,10 +1,10 @@
-package org.onap.vid.controllers;
+package org.onap.vid.controller;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
-import org.onap.vid.model.ExceptionResponse;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.vid.model.ExceptionResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -31,8 +31,7 @@ public abstract class VidRestrictedBaseController extends RestrictedBaseControll
         else {
             message = "The parameter " + e.getName() + " must be of type " + type.getTypeName();
         }
-        ResponseEntity  response = new ResponseEntity<String>(message, HttpStatus.BAD_REQUEST);
-        return response;
+        return new ResponseEntity<String>(message, HttpStatus.BAD_REQUEST);
     }
 
     @ExceptionHandler(Exception.class)