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%2FSafePolicyController.java;fp=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FSafePolicyController.java;h=23450cbbeae1612a0148a051e289d3986d775fb4;hb=9ffce7748d288fde9e55d92367a858020e5a32fc;hp=561dea8645cbbd87252b305b590996e402a291b4;hpb=0b437d897ed2f18df6d89987056faa945531c033;p=policy%2Fengine.git diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyController.java index 561dea864..23450cbbe 100644 --- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyController.java +++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyController.java @@ -21,24 +21,17 @@ package org.onap.policy.pap.xacml.rest.controller; import java.io.IOException; -import java.io.PrintWriter; 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.json.JSONObject; -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.util.DictionaryUtils; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.RiskType; import org.onap.policy.rest.jpa.SafePolicyWarning; import org.onap.policy.rest.jpa.UserInfo; -import org.onap.policy.utils.PolicyUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -53,14 +46,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Controller public class SafePolicyController { - private static final Logger LOGGER = FlexLogger.getLogger(SafePolicyController.class); - private static CommonClassDao commonClassDao; private static String duplicateResponseString = "Duplicate"; private static String operation = "operation"; - private static String apiflag = "apiflag"; - private static String utf8 = "UTF-8"; - private static String applicationJsonContentType = "application / json"; + private static String riskTypeDatas = "riskTypeDictionaryDatas"; + private static String safePolicyWarningDatas = "safePolicyWarningDatas"; @Autowired public SafePolicyController(CommonClassDao commonClassDao){ @@ -72,310 +62,149 @@ public class SafePolicyController { } public SafePolicyController(){ - //Empty Constructor + super(); } - public UserInfo getUserInfo(String loginId){ - return (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId); + private DictionaryUtils getDictionaryUtilsInstance(){ + return DictionaryUtils.dictionaryUtils != null ? DictionaryUtils.getDictionaryUtils() : new DictionaryUtils(); } @RequestMapping(value = { "/get_RiskTypeDataByName" }, method = {RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE) public void getRiskTypeDictionaryByNameEntityData(HttpServletResponse response) { - try { - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("riskTypeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(RiskType.class, "name"))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.getWriter().write(j.toString()); - } catch (Exception e) { - LOGGER.error("Exception Occured"+e); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getDataByEntity(response, riskTypeDatas, "name", RiskType.class); } @RequestMapping(value = { "/get_RiskTypeData" }, method = {RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE) public void getRiskTypeDictionaryEntityData(HttpServletResponse response) { - try { - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("riskTypeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(RiskType.class))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.addHeader("successMapKey", "success"); - response.addHeader(operation, "getDictionary"); - response.getWriter().write(j.toString()); - } catch (Exception e) { - LOGGER.error(e); - response.setStatus(HttpServletResponse.SC_BAD_REQUEST); - response.addHeader("error", "dictionaryDBQuery"); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getData(response, riskTypeDatas, RiskType.class); } @RequestMapping(value = { "/sp_dictionary/save_riskType" }, method = {RequestMethod.POST }) public ModelAndView saveRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException { + DictionaryUtils utils = getDictionaryUtilsInstance(); try { - boolean duplicateflag = false; - boolean isFakeUpdate = false; - 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()); RiskType riskTypeData; String userId = null; if (fromAPI) { - riskTypeData = mapper.readValue(root.get("dictionaryFields").toString(), - RiskType.class); + riskTypeData = mapper.readValue(root.get("dictionaryFields").toString(), RiskType.class); userId = "API"; - - //check if update operation or create, get id for data to be updated and update attributeData - if ("update".equalsIgnoreCase(request.getParameter(operation))){ - List duplicateData = commonClassDao.checkDuplicateEntry(riskTypeData.getRiskName(), "name", RiskType.class); - RiskType data = (RiskType) duplicateData.get(0); - int id = data.getId(); - - if(id==0){ - isFakeUpdate=true; - riskTypeData.setId(1); - } else { - riskTypeData.setId(id); - } - - riskTypeData.setUserCreatedBy(this.getUserInfo(userId)); - } } else { riskTypeData = mapper.readValue(root.get("riskTypeDictionaryData").toString(), RiskType.class); userId = root.get("userid").textValue(); } - - if (riskTypeData.getId() == 0) { - List duplicateData = commonClassDao.checkDuplicateEntry(riskTypeData.getRiskName(), "name", RiskType.class); - if(!duplicateData.isEmpty()){ + UserInfo userInfo = utils.getUserInfo(userId); + List duplicateData = commonClassDao.checkDuplicateEntry(riskTypeData.getRiskName(), "name", RiskType.class); + boolean duplicateflag = false; + if(!duplicateData.isEmpty()){ + RiskType data = (RiskType) duplicateData.get(0); + if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){ + riskTypeData.setId(data.getId()); + }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || + (request.getParameter(operation) == null && (data.getId() != riskTypeData.getId()))){ duplicateflag = true; - }else{ - riskTypeData.setUserCreatedBy(getUserInfo(userId)); - riskTypeData.setUserModifiedBy(getUserInfo(userId)); - commonClassDao.save(riskTypeData); } - } else { - if (!isFakeUpdate) { - riskTypeData.setUserModifiedBy(this.getUserInfo(userId)); + } + String responseString = null; + if(!duplicateflag){ + riskTypeData.setUserModifiedBy(userInfo); + if(riskTypeData.getId() == 0){ + riskTypeData.setUserCreatedBy(userInfo); + commonClassDao.save(riskTypeData); + }else{ riskTypeData.setModifiedDate(new Date()); - commonClassDao.update(riskTypeData); - } + commonClassDao.update(riskTypeData); + } + responseString = mapper.writeValueAsString(commonClassDao.getData(RiskType.class)); + }else{ + responseString = duplicateResponseString; + } + if(fromAPI){ + return utils.getResultForApi(responseString); + }else{ + utils.setResponseData(response, riskTypeDatas, responseString); } - String responseString = ""; - if(duplicateflag){ - responseString = duplicateResponseString; - }else{ - responseString = mapper.writeValueAsString(commonClassDao.getData(RiskType.class)); - } - - if (fromAPI) { - if (responseString!=null && !responseString.equals(duplicateResponseString)) { - if(isFakeUpdate){ - responseString = "Exists"; - } else { - responseString = "Success"; - } - } - 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("{riskTypeDictionaryDatas: " + responseString + "}"); - out.write(j.toString()); - return null; - } }catch (Exception e) { - LOGGER.error(e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(PolicyUtils.CATCH_EXCEPTION); + utils.setErrorResponseData(response, e); } return null; } @RequestMapping(value = { "/sp_dictionary/remove_riskType" }, method = {RequestMethod.POST }) - public ModelAndView removeRiskTypeDictionary(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()); - RiskType onapData = mapper.readValue(root.get("data").toString(), RiskType.class); - commonClassDao.delete(onapData); - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); - - PrintWriter out = response.getWriter(); - - String responseString = mapper.writeValueAsString(commonClassDao.getData(RiskType.class)); - JSONObject j = new JSONObject("{riskTypeDictionaryDatas: " + responseString + "}"); - out.write(j.toString()); - - return null; - } catch (Exception e) { - LOGGER.error(e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(PolicyUtils.CATCH_EXCEPTION); - } - return null; + public void removeRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{ + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.removeData(request, response, riskTypeDatas, RiskType.class); } - + @RequestMapping(value = { "/get_SafePolicyWarningDataByName" }, method = {RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE) public void getSafePolicyWarningEntityDataByName(HttpServletResponse response) { - try { - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("safePolicyWarningDatas", - mapper.writeValueAsString(commonClassDao.getDataByColumn(SafePolicyWarning.class, "name"))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.getWriter().write(j.toString()); - } catch (Exception e) { - LOGGER.error("Exception Occured"+e); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getDataByEntity(response, safePolicyWarningDatas, "name", SafePolicyWarning.class); } @RequestMapping(value = { "/get_SafePolicyWarningData" }, method = {RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE) public void getSafePolicyWarningeEntityData(HttpServletResponse response) { - try { - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("safePolicyWarningDatas", - mapper.writeValueAsString(commonClassDao.getData(SafePolicyWarning.class))); - JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); - JSONObject j = new JSONObject(msg); - response.addHeader("successMapKey", "success"); - response.addHeader(operation, "getDictionary"); - response.getWriter().write(j.toString()); - } catch (Exception e) { - LOGGER.error(e); - response.setStatus(HttpServletResponse.SC_BAD_REQUEST); - response.addHeader("error", "dictionaryDBQuery"); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getData(response, safePolicyWarningDatas, SafePolicyWarning.class); } @RequestMapping(value = { "/sp_dictionary/save_safePolicyWarning" }, method = {RequestMethod.POST }) public ModelAndView saveSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException { + DictionaryUtils utils = getDictionaryUtilsInstance(); try { - boolean duplicateflag = false; - boolean isFakeUpdate = false; - 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()); SafePolicyWarning safePolicyWarning; if (fromAPI) { safePolicyWarning = mapper.readValue(root.get("dictionaryFields").toString(), SafePolicyWarning.class); - - //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(safePolicyWarning.getName(), "name", SafePolicyWarning.class); - SafePolicyWarning data = (SafePolicyWarning) duplicateData.get(0); - int id = data.getId(); - - if(id==0){ - isFakeUpdate=true; - safePolicyWarning.setId(1); - } else { - safePolicyWarning.setId(id); - } - } } else { safePolicyWarning = mapper.readValue(root.get("safePolicyWarningData").toString(), SafePolicyWarning.class); } - if (safePolicyWarning.getId() == 0) { - List duplicateData = commonClassDao.checkDuplicateEntry(safePolicyWarning.getName(), "name", SafePolicyWarning.class); - if(!duplicateData.isEmpty()){ + List duplicateData = commonClassDao.checkDuplicateEntry(safePolicyWarning.getName(), "name", SafePolicyWarning.class); + boolean duplicateflag = false; + if(!duplicateData.isEmpty()){ + SafePolicyWarning data = (SafePolicyWarning) duplicateData.get(0); + if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){ + safePolicyWarning.setId(data.getId()); + }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || + (request.getParameter(operation) == null && (data.getId() != safePolicyWarning.getId()))){ duplicateflag = true; - }else{ - commonClassDao.save(safePolicyWarning); - } - } else { - if(!isFakeUpdate) { - commonClassDao.update(safePolicyWarning); } } - String responseString = ""; - if(duplicateflag){ - responseString = duplicateResponseString; - }else{ - responseString = mapper.writeValueAsString(commonClassDao.getData(SafePolicyWarning.class)); - } - - if (fromAPI) { - if (responseString!=null && !responseString.equals(duplicateResponseString)) { - if(isFakeUpdate){ - responseString = "Exists"; - } else { - responseString = "Success"; - } - } - 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("{safePolicyWarningDatas: " + responseString + "}"); - out.write(j.toString()); - return null; - } - + String responseString = null; + if(!duplicateflag){ + if(safePolicyWarning.getId() == 0){ + commonClassDao.save(safePolicyWarning); + }else{ + commonClassDao.update(safePolicyWarning); + } + responseString = mapper.writeValueAsString(commonClassDao.getData(SafePolicyWarning.class)); + }else{ + responseString = duplicateResponseString; + } + if(fromAPI){ + return utils.getResultForApi(responseString); + }else{ + utils.setResponseData(response, safePolicyWarningDatas, responseString); + } }catch (Exception e) { - LOGGER.error(e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(PolicyUtils.CATCH_EXCEPTION); + utils.setErrorResponseData(response, e); } return null; } @RequestMapping(value = { "/sp_dictionary/remove_SafePolicyWarning" }, method = {RequestMethod.POST }) public void removeSafePolicyWarningDictionary(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()); - SafePolicyWarning safePolicyWarningData = mapper.readValue(root.get("data").toString(), - SafePolicyWarning.class); - commonClassDao.delete(safePolicyWarningData); - response.setCharacterEncoding(utf8); - response.setContentType(applicationJsonContentType); - request.setCharacterEncoding(utf8); - - PrintWriter out = response.getWriter(); - - String responseString = mapper.writeValueAsString(commonClassDao.getData(SafePolicyWarning.class)); - JSONObject j = new JSONObject("{safePolicyWarningDatas: " + responseString + "}"); - out.write(j.toString()); - } catch (Exception e) { - LOGGER.error(e); - response.setCharacterEncoding(utf8); - request.setCharacterEncoding(utf8); - PrintWriter out = response.getWriter(); - out.write(PolicyUtils.CATCH_EXCEPTION); - } + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.removeData(request, response, safePolicyWarningDatas, SafePolicyWarning.class); } }