Merge "Fixed sonar issue of EPFusionBaseController.java"

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / controller / EPFusionBaseController.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
index ce4e894..05dc3c9 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
@@ -69,6 +69,7 @@ public abstract class EPFusionBaseController extends FusionBaseController {
                return true;
        }
 
+       @Override
        public boolean isRESTfulCall() {
                return true;
        }
@@ -76,7 +77,7 @@ public abstract class EPFusionBaseController extends FusionBaseController {
        @ModelAttribute("menu")
        public Map<String, Object> messages(HttpServletRequest request) {
                HttpSession session = null;
-               Map<String, Object> model = new HashMap<String, Object>();
+               Map<String, Object> model = new HashMap<>();
                session = request.getSession();
                EPUser user = EPUserUtils.getUserSession(request);
                if (session != null && user != null) {
@@ -93,11 +94,12 @@ public abstract class EPFusionBaseController extends FusionBaseController {
                return model;
        }
 
+       @Override
        public Map<String, Object> setMenu(Set<MenuData> menuResult) throws Exception {
                ObjectMapper mapper = new ObjectMapper();
-               List<List<MenuData>> childItemList = new ArrayList<List<MenuData>>();
+               List<List<MenuData>> childItemList = new ArrayList<>();
                
-               List<MenuData> parentList = new ArrayList<MenuData>();
+               List<MenuData> parentList = new ArrayList<>();
                
                Map<String, Object> model = new HashMap<>();
                for (MenuData menu : menuResult) {