From 23634dba70b166ad3c79b5eadfbd32b5375d44be Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Mon, 25 Sep 2017 16:07:54 -0400 Subject: MariaDB Connector and Sonar Scans; clean nl PORTAL-50: Fix to get the Sonar coverage for ONAP PORTAL-72: Sonar scan - resolving severity Blocker issues PORTAL-86: Remove internal att.com usages from tests and other files PORTAL-102: Fixed the page refresh issue on App Account Management page PORTAL-103: Fix to enhanced notification ticket source for ONAP PORTAL-104: Replaced mysql DB connector with mariaDB Issue: PORTAL-50 PORTAL-72 PORTAL-86 PORTAL-102 PORTAL-103 PORTAL-104 Change-Id: Iae78ad34ed9ce5ae1f2d36fcbb93fbc1e39944e5 Signed-off-by: Christopher Lott (cl778h) --- .../openecomp/portalapp/controller/EPFusionBaseController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller') diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPFusionBaseController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPFusionBaseController.java index 986f6387..dfea5fef 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPFusionBaseController.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPFusionBaseController.java @@ -78,9 +78,9 @@ public abstract class EPFusionBaseController extends FusionBaseController { public Map setMenu(Set menuResult) throws Exception { ObjectMapper mapper = new ObjectMapper(); List> childItemList = new ArrayList>(); - ; + List parentList = new ArrayList(); - ; + Map model = new HashMap(); for (MenuData menu : menuResult) { MenuData parentData = new MenuData(); @@ -99,8 +99,8 @@ public abstract class EPFusionBaseController extends FusionBaseController { } childItemList.add(tempList); } - model.put("childItemList", childItemList != null ? mapper.writeValueAsString(childItemList) : ""); - model.put("parentList", parentList != null ? mapper.writeValueAsString(parentList) : ""); + model.put("childItemList", mapper.writeValueAsString(childItemList)); + model.put("parentList", mapper.writeValueAsString(parentList)); return model; } } -- cgit 1.2.3-korg