1 files changed, 24 insertions, 73 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
index 22bc9675..6d8667f9 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
@@ -1,6 +1,6 @@
 /*-
  * ================================================================================
- * eCOMP Portal SDK
+ * ECOMP Portal SDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property
  * ================================================================================
@@ -21,154 +21,105 @@ package org.openecomp.portalsdk.core.service;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.openecomp.portalsdk.core.domain.Menu;
 import org.openecomp.portalsdk.core.domain.MenuData;
-import org.openecomp.portalsdk.core.domain.RoleFunction;
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
 /**
- * Description: this java class is an implementation of services for  Admin to add/edit/delete menu items from FN_MENU
+ * Description: this java class is an implementation of services for Admin to
+ * add/edit/delete menu items from FN_MENU
  */
 
 @Service("fnMenuService")
 @Transactional
-public class FnMenuServiceImpl implements FnMenuService{
+public class FnMenuServiceImpl implements FnMenuService {
 
-	
-	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnMenuServiceImpl.class);
 	@Autowired
-	private DataAccessService  dataAccessService;
-	
-	@Autowired
-	private RestApiRequestBuilder restApiRequestBuilder;
-	
-	@SuppressWarnings("unchecked")	
-	public List<MenuData> getFnMenuItems() {
-		//List msgDB = getDataAccessService().getList(Profile.class, null);
-		return getDataAccessService().getList(MenuData.class, null, "1", null); 
+	private DataAccessService dataAccessService;
 
+	@SuppressWarnings("unchecked")
+	public List<MenuData> getFnMenuItems() {
+		return getDataAccessService().getList(MenuData.class, null, "1", null);
 	}
-	
 
 	public DataAccessService getDataAccessService() {
 		return dataAccessService;
 	}
 
-
 	public void setDataAccessService(DataAccessService dataAccessService) {
 		this.dataAccessService = dataAccessService;
 	}
 
-
 	@Override
 	public void saveFnMenuData(MenuData domainFnMenu) {
-		// TODO Auto-generated method stub
 		getDataAccessService().saveDomainObject(domainFnMenu, null);
-		
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<Long> getParentId(String label) {
-		// TODO Auto-generated method stub
-		//List<String> functioCDlist = new ArrayList<String>();
-		//functioCDlist.add("Mahdy1");
-		//functioCDlist.add("Mahdy2");
-        Map<String, String> params = new HashMap<String, String>();
-        params.put("paramLabel", label);		
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("paramLabel", label);
 		return getDataAccessService().executeNamedQuery("IdForLabelList", params, null);
-		 	}
+	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public List<List> getParentList() {
-		// TODO Auto-generated method stub
-		//List<String> functioCDlist = new ArrayList<String>();
-		//functioCDlist.add("Mahdy1");
-		//functioCDlist.add("Mahdy2");
 		return getDataAccessService().executeNamedQuery("parentList", null, null);
-		 
-		//return null;
 	}
 	
-	@SuppressWarnings("unchecked")
-	@Override
-	public List<RoleFunction> getFunctionCDList(HttpServletRequest request) throws Exception {
-		User user = UserUtils.getUserSession(request);
-		ObjectMapper mapper = new ObjectMapper();
-		List roleFunctionFinalList = new ArrayList<>();
-		try {
-			String menuList = restApiRequestBuilder.getViaREST("/menuFunctions", true, user.getOrgUserId());
-			roleFunctionFinalList = mapper.readValue(menuList,
-					TypeFactory.defaultInstance().constructCollectionType(List.class, String.class));
-		} catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger, "saveRole Failed", e);
-			throw new Exception(e.getMessage());
-		}
-		return roleFunctionFinalList;
-	}
-
 	@Override
 	public void removeMenuItem(MenuData domainFnMenu) {
 		getDataAccessService().deleteDomainObject(domainFnMenu, null);
 	}
-	
+
 	@Override
 	public void removeMenuItem(Menu domainFnMenu) {
 		getDataAccessService().deleteDomainObject(domainFnMenu, null);
 	}
-	
+
 	public MenuData getMenuItemRow(Long id) {
-		return (MenuData)getDataAccessService().getDomainObject(MenuData.class, id, null);
+		return (MenuData) getDataAccessService().getDomainObject(MenuData.class, id, null);
 	}
-	
+
 	@Override
 	public Menu getMenuItem(Long id) {
-		return (Menu)getDataAccessService().getDomainObject(Menu.class, id, null);
+		return (Menu) getDataAccessService().getDomainObject(Menu.class, id, null);
 	}
-	
+
 	@Override
 	public void saveFnMenu(Menu domainFnMenu) {
-		// TODO Auto-generated method stub
 		getDataAccessService().saveDomainObject(domainFnMenu, null);
-		
 	}
+
 	@Override
-	public Map<String, List<MenuData>> setMenuDataStructure(List<List<MenuData>> childItemList, List<MenuData> parentList, Set<MenuData> menuResult) throws Exception{
-		for(MenuData menu: menuResult){
+	public Map<String, List<MenuData>> setMenuDataStructure(List<List<MenuData>> childItemList,
+			List<MenuData> parentList, Set<MenuData> menuResult) throws Exception {
+		for (MenuData menu : menuResult) {
 			MenuData parentData = new MenuData();
 			parentData.setLabel(menu.getLabel());
 			parentData.setAction(menu.getAction());
 			parentData.setImageSrc(menu.getImageSrc());
 			parentList.add(parentData);
 			List<MenuData> tempList = new ArrayList<MenuData>();
-			for(Object o:menu.getChildMenus()){
-				MenuData m = (MenuData)o;
+			for (Object o : menu.getChildMenus()) {
+				MenuData m = (MenuData) o;
 				MenuData data = new MenuData();
 				data.setLabel(m.getLabel());
 				data.setAction(m.getAction());
-				data.setImageSrc(m.getImageSrc());					
+				data.setImageSrc(m.getImageSrc());
 				tempList.add(data);
 			}
 			childItemList.add(tempList);
 		}
 		return null;
 	}
-	
 
 }