X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FBRMSDictionaryController.java;h=a0044d26b507e49e5f6915899996093bf796ab87;hb=f0fec2a861ea0a92b27b40882ea38f9422cde0c6;hp=e09c9ce5069dd798c37a76dfdf6727cbe3f1137f;hpb=461b2b7eeca1586423349bc0c4c65f80f027292d;p=policy%2Fengine.git diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java index e09c9ce50..a0044d26b 100644 --- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java +++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/BRMSDictionaryController.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-PAP-REST * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,27 +21,25 @@ package org.onap.policy.pap.xacml.rest.controller; import java.io.IOException; -import java.io.PrintWriter; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; -import org.json.JSONObject; import org.onap.policy.api.PEDependency; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; -import org.onap.policy.pap.xacml.rest.util.JsonMessage; +import org.onap.policy.pap.xacml.rest.components.CreateBRMSRuleTemplate; +import org.onap.policy.pap.xacml.rest.util.DictionaryUtils; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.BRMSController; import org.onap.policy.rest.jpa.BRMSDependency; import org.onap.policy.rest.jpa.BRMSParamTemplate; +import org.onap.policy.rest.jpa.OnapName; import org.onap.policy.rest.jpa.UserInfo; import org.onap.policy.utils.PolicyUtils; import org.onap.policy.xacml.api.XACMLErrorConstants; @@ -49,6 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -58,267 +57,183 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Controller public class BRMSDictionaryController{ - - private static final Logger LOGGER = FlexLogger.getLogger(BRMSDictionaryController.class); - - private static CommonClassDao commonClassDao; - private static String rule; - private static String utf8 = "UTF-8"; - private static String applicationJsonContentType = "application / json"; - private static String successMsg = "Success"; - private static String successMessage = "success"; - private static String duplicateResponseString = "Duplicate"; - private static String ruleName = "ruleName"; - private static String successMapKey = "successMapKey"; - private static String errorMsg = "error"; - private static String errorMessage = "Error"; - private static String dictionaryDBQuery = "dictionaryDBQuery"; - private static String operation = "operation"; - private static String getDictionary = "getDictionary"; - private static String apiflag = "apiflag"; - private static String dictionaryFields ="dictionaryFields"; - private static String update = "update"; - private static String userid = "userid"; - private static String dependencyName = "dependencyName"; - private static String controllerName = "controllerName"; - @Autowired - public BRMSDictionaryController(CommonClassDao commonClassDao){ - BRMSDictionaryController.commonClassDao = commonClassDao; - } - /* - * This is an empty constructor - */ - public BRMSDictionaryController() {} - - public UserInfo getUserInfo(String loginId){ - return (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId); - } + private static final Logger LOGGER = FlexLogger.getLogger(BRMSDictionaryController.class); + + private static final String VALIDATIONRESPONSE = "Validation"; + + private static CommonClassDao commonClassDao; + private static String rule; + private static String successMsg = "Success"; + private static String duplicateResponseString = "Duplicate"; + private static String ruleName = "ruleName"; + private static String errorMessage = "Error"; + private static String operation = "operation"; + private static String dictionaryFields ="dictionaryFields"; + private static String userid = "userid"; + private static String dependencyName = "dependencyName"; + private static String controllerName = "controllerName"; + private static String brmsParamDatas = "brmsParamDictionaryDatas"; + private static String brmsDependencyDatas = "brmsDependencyDictionaryDatas"; + private static String brmsControllerDatas = "brmsControllerDictionaryDatas"; + + @Autowired + public BRMSDictionaryController(CommonClassDao commonClassDao){ + BRMSDictionaryController.commonClassDao = commonClassDao; + } + + public static void setCommonClassDao(CommonClassDao commonClassDao2) { + BRMSDictionaryController.commonClassDao = commonClassDao2; + } + + public BRMSDictionaryController() { + super(); + } + + private DictionaryUtils getDictionaryUtilsInstance(){ + return DictionaryUtils.getDictionaryUtils(); + } + + @RequestMapping(value={"/get_BRMSParamDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + public void getBRMSParamDictionaryByNameEntityData(HttpServletResponse response){ + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getDataByEntity(response, brmsParamDatas, ruleName, BRMSParamTemplate.class); + } + + @RequestMapping(value={"/get_BRMSParamData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + public void getBRMSParamDictionaryEntityData(HttpServletResponse response){ + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getData(response, brmsParamDatas, BRMSParamTemplate.class); + } + + @RequestMapping(value={"/brms_dictionary/set_BRMSParamData"}, method={RequestMethod.POST}) + public static void setRuleData(HttpServletRequest request) throws IOException{ + StringWriter writer = new StringWriter(); + IOUtils.copy(request.getInputStream() , writer, StandardCharsets.UTF_8); + String cleanStreamBoundary = writer.toString().replaceFirst("------(.*)(?s).*octet-stream", ""); + rule = cleanStreamBoundary.substring(0, cleanStreamBoundary.lastIndexOf("end")+4); + } + + @RequestMapping(value={"/brms_dictionary/save_BRMSParam"}, method={RequestMethod.POST}) + public ModelAndView saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException { + DictionaryUtils utils = getDictionaryUtilsInstance(); + try { + boolean fromAPI = utils.isRequestFromAPI(request); + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + JsonNode root = mapper.readTree(request.getReader()); - @RequestMapping(value={"/get_BRMSParamDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) - public void getBRMSParamDictionaryByNameEntityData(HttpServletResponse response){ - try{ - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("brmsParamDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(BRMSParamTemplate.class, ruleName))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.getWriter().write(j.toString()); - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - } - } - - @RequestMapping(value={"/get_BRMSParamData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) - public void getBRMSParamDictionaryEntityData(HttpServletResponse response){ - try{ - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("brmsParamDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(BRMSParamTemplate.class))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.addHeader(successMapKey, successMessage); - response.addHeader(operation, getDictionary); - response.getWriter().write(j.toString()); - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setStatus(HttpServletResponse.SC_BAD_REQUEST); - response.addHeader(errorMsg, dictionaryDBQuery); - } - } - - @RequestMapping(value={"/brms_dictionary/set_BRMSParamData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public static void setRuleData(HttpServletRequest request) throws IOException{ - StringWriter writer = new StringWriter(); - IOUtils.copy(request.getInputStream() , writer, StandardCharsets.UTF_8); - String cleanStreamBoundary = writer.toString().replaceFirst("------(.*)(?s).*octet-stream", ""); - rule = cleanStreamBoundary.substring(0, cleanStreamBoundary.lastIndexOf("end")+4); - } - - @RequestMapping(value={"/brms_dictionary/save_BRMSParam"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public ModelAndView saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException { - try { - boolean duplicateflag = false; - boolean fromAPI = false; - if (request.getParameter(apiflag)!=null && ("api").equalsIgnoreCase(request.getParameter(apiflag))) { - fromAPI = true; - } - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - JsonNode root = mapper.readTree(request.getReader()); - BRMSParamTemplate bRMSParamTemplateData; String userId = null; - if(fromAPI) { - bRMSParamTemplateData = (BRMSParamTemplate)mapper.readValue(root.get(dictionaryFields).toString(), BRMSParamTemplate.class); + if(fromAPI){ + bRMSParamTemplateData = mapper.readValue(root.get(dictionaryFields).toString(), BRMSParamTemplate.class); userId = "API"; - - //check if update operation or create, get id for data to be updated and update attributeData - if ((update).equals(request.getParameter(operation))) { - List duplicateData = commonClassDao.checkDuplicateEntry(bRMSParamTemplateData.getRuleName(), ruleName, BRMSParamTemplate.class); - BRMSParamTemplate data = (BRMSParamTemplate) duplicateData.get(0); - int id = data.getId(); - bRMSParamTemplateData.setId(id); - bRMSParamTemplateData.setUserCreatedBy(this.getUserInfo(userId)); - } - } else { - bRMSParamTemplateData = (BRMSParamTemplate)mapper.readValue(root.get("brmsParamDictionaryData").toString(), BRMSParamTemplate.class); + }else{ + bRMSParamTemplateData = mapper.readValue(root.get("brmsParamDictionaryData").toString(), BRMSParamTemplate.class); userId = root.get(userid).textValue(); } - - bRMSParamTemplateData.setRule(rule); - if(bRMSParamTemplateData.getId() == 0){ - List duplicateData = commonClassDao.checkDuplicateEntry(bRMSParamTemplateData.getRuleName(), ruleName, BRMSParamTemplate.class); - if(!duplicateData.isEmpty()){ - duplicateflag = true; - }else{ - bRMSParamTemplateData.setUserCreatedBy(this.getUserInfo(userId)); - commonClassDao.save(bRMSParamTemplateData); - } - }else{ - commonClassDao.update(bRMSParamTemplateData); - } - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); + UserInfo userInfo = utils.getUserInfo(userId); - String responseString = ""; - if(duplicateflag){ - responseString = duplicateResponseString; - }else{ - responseString = mapper.writeValueAsString(BRMSDictionaryController.commonClassDao.getData(BRMSParamTemplate.class)); - } - if(fromAPI) { - if (responseString!=null && !(duplicateResponseString).equals(responseString)) { + List duplicateData = commonClassDao.checkDuplicateEntry(bRMSParamTemplateData.getRuleName(), ruleName, BRMSParamTemplate.class); + boolean duplicateflag = false; + if(!duplicateData.isEmpty()){ + BRMSParamTemplate data = (BRMSParamTemplate) duplicateData.get(0); + if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){ + bRMSParamTemplateData.setId(data.getId()); + }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || + (request.getParameter(operation) == null && (data.getId() != bRMSParamTemplateData.getId()))){ + duplicateflag = true; + } + } + String responseString = null; + boolean validation = false; + if(rule != null && CreateBRMSRuleTemplate.validateRuleParams(rule)){ + bRMSParamTemplateData.setRule(rule); + validation = true; + if(!duplicateflag){ + if(bRMSParamTemplateData.getId() == 0){ + bRMSParamTemplateData.setUserCreatedBy(userInfo); + commonClassDao.save(bRMSParamTemplateData); + }else{ + commonClassDao.update(bRMSParamTemplateData); + } + responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSParamTemplate.class)); + }else{ + responseString = duplicateResponseString; + } + } + + if(!validation){ + responseString = VALIDATIONRESPONSE; + } + if(fromAPI){ + if (responseString!=null && !(duplicateResponseString).equals(responseString) && !VALIDATIONRESPONSE.equals(responseString)) { responseString = successMsg; } ModelAndView result = new ModelAndView(); result.setViewName(responseString); return result; - } else { - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); - - PrintWriter out = response.getWriter(); - JSONObject j = new JSONObject("{brmsParamDictionaryDatas: " + responseString + "}"); - out.write(j.toString()); - return null; + }else{ + utils.setResponseData(response, brmsParamDatas, responseString); } - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(e.getMessage()); - } - return null; - } - - @RequestMapping(value={"/brms_dictionary/remove_brmsParam"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public ModelAndView removeBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response)throws IOException { - try{ - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - JsonNode root = mapper.readTree(request.getReader()); - BRMSParamTemplate bRMSParamTemplateData = (BRMSParamTemplate)mapper.readValue(root.get("data").toString(), BRMSParamTemplate.class); - commonClassDao.delete(bRMSParamTemplateData); - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); - - PrintWriter out = response.getWriter(); + }catch(Exception e){ + utils.setErrorResponseData(response, e); + } + return null; + } - String responseString = mapper.writeValueAsString(BRMSDictionaryController.commonClassDao.getData(BRMSParamTemplate.class)); - JSONObject j = new JSONObject("{brmsParamDictionaryDatas: " + responseString + "}"); - out.write(j.toString()); + @RequestMapping(value={"/brms_dictionary/remove_brmsParam"}, method={RequestMethod.POST}) + public void removeBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response)throws IOException { + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.removeData(request, response, brmsParamDatas, BRMSParamTemplate.class); + } - return null; - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(e.getMessage()); - } - return null; - } - - @RequestMapping(value={"/get_BRMSDependencyDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value={"/get_BRMSDependencyDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) public void getBRMSDependencyDictionaryByNameEntityData(HttpServletResponse response){ - try{ - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("brmsDependencyDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(BRMSDependency.class, dependencyName))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.getWriter().write(j.toString()); - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getDataByEntity(response, brmsDependencyDatas, dependencyName, BRMSDependency.class); } - @RequestMapping(value={"/get_BRMSDependencyData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value={"/get_BRMSDependencyData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) public void getBRMSDependencyDictionaryEntityData(HttpServletResponse response){ - try{ - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("brmsDependencyDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(BRMSDependency.class))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.addHeader(successMapKey, successMessage); - response.addHeader(operation, getDictionary); - response.getWriter().write(j.toString()); - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setStatus(HttpServletResponse.SC_BAD_REQUEST); - response.addHeader(errorMsg, dictionaryDBQuery); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getData(response, brmsDependencyDatas, BRMSDependency.class); } - @RequestMapping(value={"/brms_dictionary/save_BRMSDependencyData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) + @RequestMapping(value={"/brms_dictionary/save_BRMSDependencyData"}, method={RequestMethod.POST}) public ModelAndView saveBRMSDependencyDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException { + DictionaryUtils utils = getDictionaryUtilsInstance(); try { - boolean duplicateflag = false; LOGGER.debug("DictionaryController: saveBRMSDependencyDictionary() is called"); - - boolean fromAPI = false; - if (request.getParameter(apiflag)!=null && ("api").equalsIgnoreCase(request.getParameter(apiflag))) { - fromAPI = true; - } - + boolean fromAPI = utils.isRequestFromAPI(request); ObjectMapper mapper = new ObjectMapper(); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); JsonNode root = mapper.readTree(request.getReader()); - + BRMSDependency brmsDependency; String userId = null; - if (fromAPI) { - brmsDependency = (BRMSDependency)mapper.readValue(root.get(dictionaryFields).toString(), BRMSDependency.class); + if(fromAPI){ + brmsDependency = mapper.readValue(root.get(dictionaryFields).toString(), BRMSDependency.class); userId = "API"; - - //check if update operation or create, get id for data to be updated - if ((update).equals(request.getParameter(operation))) { - List duplicateData = commonClassDao.checkDuplicateEntry(brmsDependency.getDependencyName(), dependencyName, BRMSDependency.class); - BRMSDependency data = (BRMSDependency) duplicateData.get(0); - int id = data.getId(); - brmsDependency.setId(id); - brmsDependency.setUserCreatedBy(this.getUserInfo(userId)); - } - } else { - brmsDependency = (BRMSDependency)mapper.readValue(root.get("brmsDependencyDictionaryData").toString(), BRMSDependency.class); + }else{ + brmsDependency = mapper.readValue(root.get("brmsDependencyDictionaryData").toString(), BRMSDependency.class); userId = root.get(userid).textValue(); } - + UserInfo userInfo = utils.getUserInfo(userId); + + List duplicateData = commonClassDao.checkDuplicateEntry(brmsDependency.getDependencyName(), dependencyName, BRMSDependency.class); + boolean duplicateflag = false; + if(!duplicateData.isEmpty()){ + BRMSDependency data = (BRMSDependency) duplicateData.get(0); + if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){ + brmsDependency.setId(data.getId()); + }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || + (request.getParameter(operation) == null && (data.getId() != brmsDependency.getId()))){ + duplicateflag = true; + } + } LOGGER.audit("the userId from the onap portal is: " + userId); String responseString = null; - if(brmsDependency.getDependency()!=null && !("").equals(brmsDependency.getDependency().trim())){ PEDependency dependency = null; try{ @@ -329,147 +244,88 @@ public class BRMSDictionaryController{ if(dependency==null){ responseString = errorMessage; }else{ - if(brmsDependency.getId() == 0){ - List duplicateData = commonClassDao.checkDuplicateEntry(brmsDependency.getDependencyName(), dependencyName, BRMSDependency.class); - if(!duplicateData.isEmpty()){ - duplicateflag = true; - }else{ - brmsDependency.setUserCreatedBy(getUserInfo(userId)); - brmsDependency.setUserModifiedBy(getUserInfo(userId)); - LOGGER.audit("DictionaryController: got the user info now about to call Save() method on brmsDependencydao"); + if(!duplicateflag){ + brmsDependency.setUserModifiedBy(userInfo); + if(brmsDependency.getId() == 0){ + brmsDependency.setUserCreatedBy(userInfo); commonClassDao.save(brmsDependency); + }else{ + brmsDependency.setModifiedDate(new Date()); + commonClassDao.update(brmsDependency); } + responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSDependency.class)); }else{ - brmsDependency.setUserModifiedBy(this.getUserInfo(userId)); - brmsDependency.setModifiedDate(new Date()); - commonClassDao.update(brmsDependency); - } - if(duplicateflag) { responseString = duplicateResponseString; - } else { - responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSDependency.class)); } } } - if (fromAPI) { - if (responseString!=null && !(duplicateResponseString).equals(responseString) && !(errorMessage).equals(responseString)) { + + if(fromAPI){ + if(responseString!=null && !duplicateResponseString.equals(responseString) && !errorMessage.equals(responseString)){ responseString = successMsg; } ModelAndView result = new ModelAndView(); result.setViewName(responseString); return result; - } else { - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - JSONObject j = new JSONObject("{brmsDependencyDictionaryDatas: " + responseString + "}"); - out.write(j.toString()); - - return null; + }else{ + utils.setResponseData(response, brmsDependencyDatas, responseString); } } catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(e.getMessage()); + utils.setErrorResponseData(response, e); } return null; } - @RequestMapping(value={"/brms_dictionary/remove_brmsDependency"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public ModelAndView removeBRMSDependencyDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException { - try{ - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - JsonNode root = mapper.readTree(request.getReader()); - BRMSDependency brmsDependency = (BRMSDependency)mapper.readValue(root.get("data").toString(), BRMSDependency.class); - commonClassDao.delete(brmsDependency); - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - String responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSDependency.class)); - JSONObject j = new JSONObject("{brmsDependencyDictionaryDatas: " + responseString + "}"); - out.write(j.toString()); - return null; - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(e.getMessage()); - } - return null; + @RequestMapping(value={"/brms_dictionary/remove_brmsDependency"}, method={RequestMethod.POST}) + public void removeBRMSDependencyDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException { + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.removeData(request, response, brmsDependencyDatas, BRMSDependency.class); } - @RequestMapping(value={"/get_BRMSControllerDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value={"/get_BRMSControllerDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) public void getBRMSControllerDictionaryByNameEntityData(HttpServletResponse response){ - try{ - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("brmsControllerDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(BRMSController.class, controllerName))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.getWriter().write(j.toString()); - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getDataByEntity(response, brmsControllerDatas, controllerName, BRMSController.class); } - @RequestMapping(value={"/get_BRMSControllerData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value={"/get_BRMSControllerData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) public void getBRMSControllerDictionaryEntityData(HttpServletResponse response){ - try{ - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("brmsControllerDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(BRMSController.class))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.addHeader(successMapKey, successMessage); - response.addHeader(operation, getDictionary); - response.getWriter().write(j.toString()); - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setStatus(HttpServletResponse.SC_BAD_REQUEST); - response.addHeader(errorMsg, dictionaryDBQuery); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getData(response, brmsControllerDatas, BRMSController.class); } - @RequestMapping(value={"/brms_dictionary/save_BRMSControllerData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) + @RequestMapping(value={"/brms_dictionary/save_BRMSControllerData"}, method={RequestMethod.POST}) public ModelAndView saveBRMSControllerDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{ + DictionaryUtils utils = getDictionaryUtilsInstance(); try { - boolean duplicateflag = false; LOGGER.debug("DictionaryController: saveBRMSControllerDictionary() is called"); - boolean fromAPI = false; - if (request.getParameter(apiflag)!=null && ("api").equalsIgnoreCase(request.getParameter(apiflag))) { - fromAPI = true; - } + boolean fromAPI = utils.isRequestFromAPI(request); ObjectMapper mapper = new ObjectMapper(); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); JsonNode root = mapper.readTree(request.getReader()); BRMSController brmsController; String userId = null; - if (fromAPI) { - brmsController = (BRMSController)mapper.readValue(root.get(dictionaryFields).toString(), BRMSController.class); + if(fromAPI){ + brmsController = mapper.readValue(root.get(dictionaryFields).toString(), BRMSController.class); userId = "API"; - //check if update operation or create, get id for data to be updated - if ((update).equals(request.getParameter(operation))) { - List duplicateData = commonClassDao.checkDuplicateEntry(brmsController.getControllerName(), controllerName, BRMSController.class); - BRMSController data = (BRMSController) duplicateData.get(0); - int id = data.getId(); - brmsController.setId(id); - brmsController.setUserCreatedBy(this.getUserInfo(userId)); - } - } else { - brmsController = (BRMSController)mapper.readValue(root.get("brmsControllerDictionaryData").toString(), BRMSController.class); + }else{ + brmsController = mapper.readValue(root.get("brmsControllerDictionaryData").toString(), BRMSController.class); userId = root.get(userid).textValue(); } - LOGGER.audit("the userId from the onap portal is: " + userId); + UserInfo userInfo = utils.getUserInfo(userId); + + List duplicateData = commonClassDao.checkDuplicateEntry(brmsController.getControllerName(), controllerName, BRMSController.class); + boolean duplicateflag = false; + if(!duplicateData.isEmpty()){ + BRMSController data = (BRMSController) duplicateData.get(0); + if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){ + brmsController.setId(data.getId()); + }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || + (request.getParameter(operation) == null && (data.getId() != brmsController.getId()))){ + duplicateflag = true; + } + } String responseString = null; if(brmsController.getController()!=null && !("").equals(brmsController.getController().trim())){ PEDependency dependency = null; @@ -481,87 +337,48 @@ public class BRMSDictionaryController{ if(dependency==null){ responseString = errorMessage; }else{ - if(brmsController.getId() == 0){ - List duplicateData = commonClassDao.checkDuplicateEntry(brmsController.getControllerName(), controllerName, BRMSController.class); - if(!duplicateData.isEmpty()){ - duplicateflag = true; - }else{ - brmsController.setUserCreatedBy(getUserInfo(userId)); - brmsController.setUserModifiedBy(getUserInfo(userId)); - LOGGER.audit("DictionaryController: got the user info now about to call Save() method on brmsControllerdao"); + if(!duplicateflag){ + brmsController.setUserModifiedBy(userInfo); + if(brmsController.getId() == 0){ + brmsController.setUserCreatedBy(userInfo); commonClassDao.save(brmsController); + }else{ + brmsController.setModifiedDate(new Date()); + commonClassDao.update(brmsController); } + responseString = mapper.writeValueAsString(commonClassDao.getData(OnapName.class)); }else{ - brmsController.setUserModifiedBy(this.getUserInfo(userId)); - brmsController.setModifiedDate(new Date()); - commonClassDao.update(brmsController); - } - if(duplicateflag) { responseString = duplicateResponseString; - } else { - responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSController.class)); } } } - if (fromAPI) { + if(fromAPI){ if (responseString!=null && !(duplicateResponseString).equals(responseString) && !(errorMessage).equals(responseString)) { responseString = successMsg; } ModelAndView result = new ModelAndView(); result.setViewName(responseString); return result; - } else { - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - JSONObject j = new JSONObject("{brmsControllerDictionaryDatas: " + responseString + "}"); - out.write(j.toString()); - return null; + }else{ + utils.setResponseData(response, brmsControllerDatas, responseString); } } catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(e.getMessage()); + utils.setErrorResponseData(response, e); } return null; } - @RequestMapping(value={"/brms_dictionary/remove_brmsController"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public ModelAndView removeBRMSControllerDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{ - try{ - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - JsonNode root = mapper.readTree(request.getReader()); - BRMSController brmsController = (BRMSController)mapper.readValue(root.get("data").toString(), BRMSController.class); - commonClassDao.delete(brmsController); - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - String responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSController.class)); - JSONObject j = new JSONObject("{brmsControllerDictionaryDatas: " + responseString + "}"); - out.write(j.toString()); - return null; - } - catch (Exception e){ - LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(e.getMessage()); - } - return null; + @RequestMapping(value={"/brms_dictionary/remove_brmsController"}, method={RequestMethod.POST}) + public void removeBRMSControllerDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{ + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.removeData(request, response, brmsControllerDatas, BRMSController.class); } public BRMSDependency getDependencyDataByID(String dependencyName){ - return (BRMSDependency) commonClassDao.getEntityItem(BRMSDependency.class, dependencyName, dependencyName); + return (BRMSDependency) commonClassDao.getEntityItem(BRMSDependency.class, BRMSDictionaryController.dependencyName, dependencyName); } public BRMSController getControllerDataByID(String controllerName){ - return (BRMSController) commonClassDao.getEntityItem(BRMSController.class, controllerName, controllerName); - } - + return (BRMSController) commonClassDao.getEntityItem(BRMSController.class, BRMSDictionaryController.controllerName, controllerName); + } }