Fix final 10 vulnerabilities in policy/engine
[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / controller / PolicyScopeDictionaryController.java
index 44ab4a3..fd3d2f6 100644 (file)
@@ -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.
 package org.onap.policy.pap.xacml.rest.controller;
 
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
-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.lang.StringUtils;
-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.GroupPolicyScopeList;
+import org.onap.policy.rest.jpa.OnapName;
 import org.onap.policy.rest.jpa.PolicyScopeClosedLoop;
 import org.onap.policy.rest.jpa.PolicyScopeResource;
 import org.onap.policy.rest.jpa.PolicyScopeService;
 import org.onap.policy.rest.jpa.PolicyScopeType;
-import org.onap.policy.rest.jpa.UserInfo;
 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;
@@ -59,129 +55,87 @@ public class PolicyScopeDictionaryController {
        private static final Logger LOGGER  = FlexLogger.getLogger(PolicyScopeDictionaryController.class);
 
        private static CommonClassDao commonClassDao;
+       private static String operation = "operation";
+       private static String groupPolicyScopeListData1 = "groupPolicyScopeListData1";
+       private static String policyScope= "PolicyScope";
+       private static String duplicateResponseString = "Duplicate";
+       private static String groupPolicyScopeDatas = "groupPolicyScopeListDatas";
+       private static String dictionaryFields = "dictionaryFields";
+       private static String psCLDatas = "psClosedLoopDictionaryDatas";
+       private static String psServiceDatas = "psServiceDictionaryDatas";
+       private static String psTypeDatas = "psTypeDictionaryDatas";
+       private static String psResourceDatas = "psResourceDictionaryDatas";
+
+       public PolicyScopeDictionaryController(){
+               super();
+       }       
+
+       private DictionaryUtils getDictionaryUtilsInstance(){
+               return DictionaryUtils.getDictionaryUtils();
+       }
        
        @Autowired
        public PolicyScopeDictionaryController(CommonClassDao commonClassDao){
                PolicyScopeDictionaryController.commonClassDao = commonClassDao;
        }
        
-       public PolicyScopeDictionaryController(){}      
-
-       private static String SUCCESSMAPKEY = "successMapKey";
-
-       public UserInfo getUserInfo(String loginId){
-               UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-               return name;    
+       public void setCommonClassDao(CommonClassDao commonClassDao){
+               PolicyScopeDictionaryController.commonClassDao = commonClassDao;
        }
-
-       @RequestMapping(value={"/get_GroupPolicyScopeDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getGroupPolicyScopeEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("groupPolicyScopeListDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(GroupPolicyScopeList.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);
-               }
+       
+       @RequestMapping(value={"/get_GroupPolicyScopeDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getGroupPolicyScopeEntityDataByName(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getDataByEntity(response, groupPolicyScopeDatas, "name", GroupPolicyScopeList.class);
        }
 
-       @RequestMapping(value={"/get_GroupPolicyScopeData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getGroupPolicyScopeEntityData(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("groupPolicyScopeListDatas", mapper.writeValueAsString(commonClassDao.getData(GroupPolicyScopeList.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){
-                       response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-                       response.addHeader("error", "dictionaryDBQuery");
-                       LOGGER.error(e);
-               }
+       @RequestMapping(value={"/get_GroupPolicyScopeData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getGroupPolicyScopeEntityData(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getData(response, groupPolicyScopeDatas, GroupPolicyScopeList.class);
        }
 
-       @RequestMapping(value={"/ps_dictionary/save_psGroupPolicyScope"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+       @RequestMapping(value={"/ps_dictionary/save_psGroupPolicyScope"}, method={RequestMethod.POST})
+       public ModelAndView savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+               DictionaryUtils utils = getDictionaryUtilsInstance();
                try {
-                       boolean duplicateflag = false;
-                       boolean isFakeUpdate = false;
-                       boolean duplicateGroupFlag = false;
-                       boolean fromAPI = false;
-                       if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                               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());
-                       //GroupPolicyScopeList gpdata = (GroupPolicyScopeList)mapper.readValue(root.get("groupPolicyScopeListData").toString(), GroupPolicyScopeList.class);
                        GroupPolicyScopeList gpdata = null;
                        GroupPolicyScope groupData = null;
+                       boolean duplicateGroupFlag = false;
                        if (fromAPI) {
-                               gpdata = (GroupPolicyScopeList)mapper.readValue(root.get("dictionaryFields").toString(), GroupPolicyScopeList.class);
+                               gpdata = mapper.readValue(root.get(dictionaryFields).toString(), GroupPolicyScopeList.class);
                                try{
-                                       groupData = (GroupPolicyScope)mapper.readValue(root.get("groupPolicyScopeListData1").toString(), GroupPolicyScope.class);
+                                       groupData = mapper.readValue(root.get(groupPolicyScopeListData1).toString(), GroupPolicyScope.class);
                                }catch(Exception e){
                                        groupData = new GroupPolicyScope();
-                                       groupData.setResource(root.get("dictionaryFields").get("resource").toString().replace("\"", ""));
-                                       groupData.setClosedloop(root.get("dictionaryFields").get("closedloop").toString().replace("\"", ""));
-                                       groupData.setService(root.get("dictionaryFields").get("service").toString().replace("\"", ""));
-                                       groupData.setType(root.get("dictionaryFields").get("type").toString().replace("\"", ""));
+                                       groupData.setResource(root.get(dictionaryFields).get("resource").toString().replace("\"", ""));
+                                       groupData.setClosedloop(root.get(dictionaryFields).get("closedloop").toString().replace("\"", ""));
+                                       groupData.setService(root.get(dictionaryFields).get("service").toString().replace("\"", ""));
+                                       groupData.setType(root.get(dictionaryFields).get("type").toString().replace("\"", ""));
                                        LOGGER.error(e);
                                }
-
-                               if(!gpdata.getGroupName().startsWith("PolicyScope")){
-                                       String name = "PolicyScope_" + gpdata.getGroupName();
-                                       gpdata.setGroupName(name);
-                               }
-
-                               //check if update operation or create, get id for data to be updated and update attributeData
-                               if (request.getParameter("operation").equals("update")) {
-
-                                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(gpdata.getGroupName(), "name", GroupPolicyScopeList.class);
-                                       int id = 0;
-                                       for (int i =0; i< duplicateData.size(); i++){
-                                               GroupPolicyScopeList data = (GroupPolicyScopeList) duplicateData.get(0);
-                                               id = data.getId();
-                                       }                   
-
-                                       if(id==0){
-                                               isFakeUpdate=true;
-                                               gpdata.setId(1);
-                                       } else {
-                                               gpdata.setId(id);
-                                       }
-
-                               }
                        } else {
-                               gpdata = (GroupPolicyScopeList)mapper.readValue(root.get("groupPolicyScopeListData").toString(), GroupPolicyScopeList.class);
-
+                               gpdata = mapper.readValue(root.get("groupPolicyScopeListData").toString(), GroupPolicyScopeList.class);
                                try{
-                                       groupData = (GroupPolicyScope)mapper.readValue(root.get("groupPolicyScopeListData1").toString(), GroupPolicyScope.class);
+                                       groupData = mapper.readValue(root.get(groupPolicyScopeListData1).toString(), GroupPolicyScope.class);
                                }catch(Exception e){
                                        LOGGER.error(e);
                                        groupData = new GroupPolicyScope();
-                                       groupData.setResource(root.get("groupPolicyScopeListData1").get("resource").toString().replace("\"", ""));
-                                       groupData.setClosedloop(root.get("groupPolicyScopeListData1").get("closedloop").toString().replace("\"", ""));
-                                       groupData.setService(root.get("groupPolicyScopeListData1").get("service").toString().replace("\"", ""));
-                                       groupData.setType(root.get("groupPolicyScopeListData1").get("type").toString().replace("\"", ""));
-                               }
-                               if(!gpdata.getGroupName().startsWith("PolicyScope")){
-                                       String name = "PolicyScope_" + gpdata.getGroupName();
-                                       gpdata.setGroupName(name);
+                                       groupData.setResource(root.get(groupPolicyScopeListData1).get("resource").toString().replace("\"", ""));
+                                       groupData.setClosedloop(root.get(groupPolicyScopeListData1).get("closedloop").toString().replace("\"", ""));
+                                       groupData.setService(root.get(groupPolicyScopeListData1).get("service").toString().replace("\"", ""));
+                                       groupData.setType(root.get(groupPolicyScopeListData1).get("type").toString().replace("\"", ""));
                                }
-
+                       }
+                       if(!gpdata.getGroupName().startsWith(policyScope)){
+                               String name = "PolicyScope_" + gpdata.getGroupName();
+                               gpdata.setGroupName(name);
                        }
                        ArrayList<String> valueList = new ArrayList<>();
-                       String list = null;
                        String resourceValue = groupData.getResource();
                        String typeValue = groupData.getType();
                        String serviceValue = groupData.getService();
@@ -190,719 +144,318 @@ public class PolicyScopeDictionaryController {
                        valueList.add("service=" + serviceValue);
                        valueList.add("type=" + typeValue);
                        valueList.add("closedLoopControlName="  + closedLoopValue);
-                       list = StringUtils.replaceEach(valueList.toString(), new String[]{"[", "]", " "}, new String[]{"", "", ""});
+                       String list = StringUtils.replaceEach(valueList.toString(), new String[]{"[", "]", " "}, new String[]{"", "", ""});
                        gpdata.setGroupList(list);
-                       if(!gpdata.getGroupName().startsWith("PolicyScope")){
-                               String name = "PolicyScope_" + gpdata.getGroupName();
-                               gpdata.setGroupName(name);
-                       }
-                       if(gpdata.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(gpdata.getGroupName(), "name", GroupPolicyScopeList.class);
-                               if(!duplicateData.isEmpty()){
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(gpdata.getGroupName(), "name", GroupPolicyScopeList.class);
+                       if(duplicateData.isEmpty()){
+                               duplicateData =  commonClassDao.checkDuplicateEntry(gpdata.getGroupList(), "groupList", GroupPolicyScopeList.class);
+                               if(duplicateData.isEmpty()){
+                                       duplicateGroupFlag = true;
+                               }
+                       } 
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               GroupPolicyScopeList data = (GroupPolicyScopeList) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       gpdata.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != gpdata.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       duplicateData =  commonClassDao.checkDuplicateEntry(gpdata.getGroupList(), "groupList", GroupPolicyScopeList.class);
-                                       if(!duplicateData.isEmpty()){
-                                               duplicateGroupFlag = true;
-                                       }else{
-                                               commonClassDao.save(gpdata);
-                                       }
                                }
-                       }else{
-                               if(!isFakeUpdate) {
-                                       List<Object> duplicateGroupList =  commonClassDao.checkExistingGroupListforUpdate(gpdata.getGroupList(), gpdata.getGroupName());
-                                       if(!duplicateGroupList.isEmpty()) {
-                                               duplicateGroupFlag = true;
-                                       } else {
-                                               commonClassDao.update(gpdata); 
-                                       }
-                               } 
                        }
-                       String responseString = "";
-                       if(duplicateflag){
-                               responseString = "Duplicate";
+                       String responseString = null;
+                       if(!duplicateflag && !duplicateGroupFlag){
+                               if(gpdata.getId() == 0){
+                                       commonClassDao.save(gpdata);
+                               }else{
+                                       commonClassDao.update(gpdata); 
+                               } 
+                               responseString = mapper.writeValueAsString(commonClassDao.getData(GroupPolicyScopeList.class));
                        }else if(duplicateGroupFlag){
                                responseString = "DuplicateGroup";
                        }else{
-                               responseString = mapper.writeValueAsString(commonClassDao.getData(GroupPolicyScopeList.class));
+                               responseString = duplicateResponseString;
                        }
-
-                       if (fromAPI) {
-                               if (responseString!=null && !responseString.equals("Duplicate") && !responseString.equals("DuplicateGroup")) {
-                                       if(isFakeUpdate){
-                                               responseString = "Exists";
-                                       } else {
-                                               responseString = "Success";
-                                       }
-                               }
-
-                               ModelAndView result = new ModelAndView();
-                               result.setViewName(responseString);
-                               return result;
-                       } else {
-
-                               response.setCharacterEncoding("UTF-8");
-                               response.setContentType("application / json");
-                               request.setCharacterEncoding("UTF-8");
-
-                               PrintWriter out = response.getWriter();
-                               JSONObject j = new JSONObject("{groupPolicyScopeListDatas: " + responseString + "}");
-                               out.write(j.toString());
-                               return null;
+                       if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, groupPolicyScopeDatas, responseString);
                        }
                }catch (Exception e){
-                       LOGGER.error(e);
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-                       
+                       utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/ps_dictionary/remove_GroupPolicyScope"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-               try{
-                       ObjectMapper mapper = new ObjectMapper();
-                       mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                       JsonNode root = mapper.readTree(request.getReader());
-                       GroupPolicyScopeList onapData = (GroupPolicyScopeList)mapper.readValue(root.get("data").toString(), GroupPolicyScopeList.class);
-                       commonClassDao.delete(onapData);
-                       response.setCharacterEncoding("UTF-8");
-                       response.setContentType("application / json");
-                       request.setCharacterEncoding("UTF-8");
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(GroupPolicyScopeList.class));
-                       JSONObject j = new JSONObject("{groupPolicyScopeListDatas: " + responseString + "}");
-                       out.write(j.toString());
-
-                       return null;
-               }
-               catch (Exception e){
-                       System.out.println(e);
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-               }
-               return null;
+       @RequestMapping(value={"/ps_dictionary/remove_GroupPolicyScope"}, method={RequestMethod.POST})
+       public void removePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, groupPolicyScopeDatas, GroupPolicyScopeList.class);
        }
 
-       @RequestMapping(value={"/get_PSClosedLoopDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getPSClosedLoopEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("psClosedLoopDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(PolicyScopeClosedLoop.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);
-               }
+       @RequestMapping(value={"/get_PSClosedLoopDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getPSClosedLoopEntityDataByName(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getDataByEntity(response, psCLDatas, "name", OnapName.class);
        }
 
-       @RequestMapping(value={"/get_PSClosedLoopData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getPSClosedLoopEntityData(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("psClosedLoopDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(PolicyScopeClosedLoop.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){
-                       response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-                       response.addHeader("error", "dictionaryDBQuery");
-                       LOGGER.error(e);
-               }
+       @RequestMapping(value={"/get_PSClosedLoopData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getPSClosedLoopEntityData(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getData(response, psCLDatas, PolicyScopeClosedLoop.class);
        }
 
-       @RequestMapping(value={"/ps_dictionary/save_psClosedLoop"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+       @RequestMapping(value={"/ps_dictionary/save_psClosedLoop"}, method={RequestMethod.POST})
+       public ModelAndView savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+               DictionaryUtils utils = getDictionaryUtilsInstance();
                try {
-                       boolean duplicateflag = false;
-                       boolean isFakeUpdate = false;
-                       boolean fromAPI = false;
-                       if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                               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());
                        PolicyScopeClosedLoop onapData;
-                       if (fromAPI) {
-                               onapData = (PolicyScopeClosedLoop)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeClosedLoop.class);
-
-                               //check if update operation or create, get id for data to be updated and update attributeData
-                               if (request.getParameter("operation").equals("update")) {
-                                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeClosedLoop.class);
-                                       int id = 0;
-                                       for (int i =0; i< duplicateData.size(); i++){
-                                               PolicyScopeClosedLoop data = (PolicyScopeClosedLoop) duplicateData.get(0);
-                                               id = data.getId();
-                                       }
-
-                                       if(id==0){
-                                               isFakeUpdate=true;
-                                               onapData.setId(1);
-                                       } else {
-                                               onapData.setId(id);
-                                       }   
-
-                               }
-                       } else {
-                               onapData = (PolicyScopeClosedLoop)mapper.readValue(root.get("psClosedLoopDictionaryData").toString(), PolicyScopeClosedLoop.class);
+                       if(fromAPI){
+                               onapData = mapper.readValue(root.get(dictionaryFields).toString(), PolicyScopeClosedLoop.class);
+                       }else{
+                               onapData = mapper.readValue(root.get("psClosedLoopDictionaryData").toString(), PolicyScopeClosedLoop.class);
                        }
-                       if(onapData.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeClosedLoop.class);
-                               if(!duplicateData.isEmpty()){
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeClosedLoop.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               PolicyScopeClosedLoop data = (PolicyScopeClosedLoop) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       onapData.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != onapData.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       commonClassDao.save(onapData);
                                }
-                       }else{
-                               if(!isFakeUpdate) {
+                       }
+                       String responseString = null;
+                       if(!duplicateflag){
+                               if(onapData.getId() == 0){
+                                       commonClassDao.save(onapData);
+                               }else{
                                        commonClassDao.update(onapData); 
-                               }
-                       } 
-                       String responseString = "";
-                       if(duplicateflag){
-                               responseString = "Duplicate";
-                       }else{
+                               } 
                                responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeClosedLoop.class));
+                       }else{
+                               responseString = duplicateResponseString;
                        }
-
-                       if (fromAPI) {
-                               if (responseString!=null && !responseString.equals("Duplicate")) {
-                                       if(isFakeUpdate){
-                                               responseString = "Exists";
-                                       } else {
-                                               responseString = "Success";
-                                       }
-                               }
-                               ModelAndView result = new ModelAndView();
-                               result.setViewName(responseString);
-                               return result;
-                       } else {
-                               response.setCharacterEncoding("UTF-8");
-                               response.setContentType("application / json");
-                               request.setCharacterEncoding("UTF-8");
-
-                               PrintWriter out = response.getWriter();
-                               JSONObject j = new JSONObject("{psClosedLoopDictionaryDatas: " + responseString + "}");
-
-                               out.write(j.toString());
-
-                               return null;
+                       if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, psCLDatas, responseString);
                        }
-
                }catch (Exception e){
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-                       LOGGER.error(e);
+                       utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/ps_dictionary/remove_PSClosedLoop"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-               try{
-                       ObjectMapper mapper = new ObjectMapper();
-                       mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                       JsonNode root = mapper.readTree(request.getReader());
-                       PolicyScopeClosedLoop onapData = (PolicyScopeClosedLoop)mapper.readValue(root.get("data").toString(), PolicyScopeClosedLoop.class);
-                       commonClassDao.delete(onapData);
-                       response.setCharacterEncoding("UTF-8");
-                       response.setContentType("application / json");
-                       request.setCharacterEncoding("UTF-8");
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeClosedLoop.class));
-                       JSONObject j = new JSONObject("{psClosedLoopDictionaryDatas: " + responseString + "}");
-                       out.write(j.toString());
-
-                       return null;
-               }
-               catch (Exception e){
-                       System.out.println(e);
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-               }
-               return null;
+       @RequestMapping(value={"/ps_dictionary/remove_PSClosedLoop"}, method={RequestMethod.POST})
+       public void removePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, psCLDatas, PolicyScopeClosedLoop.class);
        }
 
-       @RequestMapping(value={"/get_PSServiceDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getPSServiceEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("psServiceDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(PolicyScopeService.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);
-               }
+       @RequestMapping(value={"/get_PSServiceDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getPSServiceEntityDataByName(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getDataByEntity(response, psServiceDatas, "name", PolicyScopeService.class);
        }
 
-       @RequestMapping(value={"/get_PSServiceData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getPSServiceEntityData(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("psServiceDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(PolicyScopeService.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){
-                       response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-                       response.addHeader("error", "dictionaryDBQuery");
-                       LOGGER.error(e);
-               }
+       @RequestMapping(value={"/get_PSServiceData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getPSServiceEntityData(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getData(response, psServiceDatas, PolicyScopeService.class);
        }
 
-       @RequestMapping(value={"/ps_dictionary/save_psService"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+       @RequestMapping(value={"/ps_dictionary/save_psService"}, method={RequestMethod.POST})
+       public ModelAndView savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+               DictionaryUtils utils = getDictionaryUtilsInstance();
                try {
-                       boolean duplicateflag = false;
-                       boolean isFakeUpdate = false;
-                       boolean fromAPI = false;
-                       if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                               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());
                        PolicyScopeService onapData;
                        if (fromAPI) {
-                               onapData = (PolicyScopeService)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeService.class);
-
-                               //check if update operation or create, get id for data to be updated and update attributeData
-                               if (request.getParameter("operation").equals("update")) {
-                                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeService.class);
-                                       int id = 0;
-                                       for (int i =0; i< duplicateData.size(); i++){
-                                               PolicyScopeService data = (PolicyScopeService) duplicateData.get(0);
-                                               id = data.getId();
-                                       }
-                                       if(id==0){
-                                               isFakeUpdate=true;
-                                               onapData.setId(1);
-                                       } else {
-                                               onapData.setId(id);
-                                       }
-                               }
+                               onapData = mapper.readValue(root.get(dictionaryFields).toString(), PolicyScopeService.class);
                        } else {
-                               onapData = (PolicyScopeService)mapper.readValue(root.get("psServiceDictionaryData").toString(), PolicyScopeService.class);
+                               onapData = mapper.readValue(root.get("psServiceDictionaryData").toString(), PolicyScopeService.class);
                        }
-                       if(onapData.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeService.class);
-                               if(!duplicateData.isEmpty()){
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeService.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               PolicyScopeService data = (PolicyScopeService) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       onapData.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != onapData.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       commonClassDao.save(onapData);
                                }
-                       }else{
-                               if(!isFakeUpdate) {
+                       }
+                       String responseString = null;
+                       if(!duplicateflag){
+                               if(onapData.getId() == 0){
+                                       commonClassDao.save(onapData);
+                               }else{
                                        commonClassDao.update(onapData); 
-                               }
-                       } 
-
-                       String responseString = "";
-                       if(duplicateflag){
-                               responseString = "Duplicate";
-                       }else{
+                               } 
                                responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeService.class));
-                       }   
-
-                       if (fromAPI) {
-                               if (responseString!=null && !responseString.equals("Duplicate")) {
-                                       if(isFakeUpdate){
-                                               responseString = "Exists";
-                                       } else {
-                                               responseString = "Success";
-                                       }
-                               }
-                               ModelAndView result = new ModelAndView();
-                               result.setViewName(responseString);
-                               return result;
-
-                       } else {
-                               response.setCharacterEncoding("UTF-8");
-                               response.setContentType("application / json");
-                               request.setCharacterEncoding("UTF-8");
-
-                               PrintWriter out = response.getWriter();
-                               JSONObject j = new JSONObject("{psServiceDictionaryDatas: " + responseString + "}");
-                               out.write(j.toString());
-                               return null;
+                       }else{
+                               responseString = duplicateResponseString;
+                       }
+                       if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, psServiceDatas, responseString);
                        }
                }catch (Exception e){
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-                       LOGGER.error(e);
+                       utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/ps_dictionary/remove_PSService"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-               try{
-                       ObjectMapper mapper = new ObjectMapper();
-                       mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                       JsonNode root = mapper.readTree(request.getReader());
-                       PolicyScopeService onapData = (PolicyScopeService)mapper.readValue(root.get("data").toString(), PolicyScopeService.class);
-                       commonClassDao.delete(onapData);
-                       response.setCharacterEncoding("UTF-8");
-                       response.setContentType("application / json");
-                       request.setCharacterEncoding("UTF-8");
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeService.class));
-                       JSONObject j = new JSONObject("{psServiceDictionaryDatas: " + responseString + "}");
-                       out.write(j.toString());
-
-                       return null;
-               }
-               catch (Exception e){
-                       System.out.println(e);
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-               }
-               return null;
+       @RequestMapping(value={"/ps_dictionary/remove_PSService"}, method={RequestMethod.POST})
+       public void removePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, psServiceDatas, PolicyScopeService.class);
        }
 
-       @RequestMapping(value={"/get_PSTypeDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getPSTypeEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("psTypeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(PolicyScopeType.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);
-               }
+       @RequestMapping(value={"/get_PSTypeDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getPSTypeEntityDataByName(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getDataByEntity(response, psTypeDatas, "name", PolicyScopeType.class);
        }
 
-       @RequestMapping(value={"/get_PSTypeData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getPSTypeEntityData(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("psTypeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(PolicyScopeType.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){
-                       response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-                       response.addHeader("error", "dictionaryDBQuery");
-                       LOGGER.error(e);
-               }
+       @RequestMapping(value={"/get_PSTypeData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getPSTypeEntityData(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getData(response, psTypeDatas, PolicyScopeType.class);
        }
 
-       @RequestMapping(value={"/ps_dictionary/save_psType"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+       @RequestMapping(value={"/ps_dictionary/save_psType"}, method={RequestMethod.POST})
+       public ModelAndView savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+               DictionaryUtils utils = getDictionaryUtilsInstance();
                try {
-                       boolean duplicateflag = false;
-                       boolean isFakeUpdate = false;
-                       boolean fromAPI = false;
-                       if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                               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());
                        PolicyScopeType onapData;
-                       if (fromAPI) {
-                               onapData = (PolicyScopeType)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeType.class);
-
-                               //check if update operation or create, get id for data to be updated and update attributeData
-                               if (request.getParameter("operation").equals("update")) {
-                                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeType.class);
-                                       int id = 0;
-                                       for (int i =0; i< duplicateData.size(); i++){
-                                               PolicyScopeType data = (PolicyScopeType) duplicateData.get(0);
-                                               id = data.getId();
-                                       }
-
-                                       if(id==0){
-                                               isFakeUpdate=true;
-                                               onapData.setId(1);
-                                       } else {
-                                               onapData.setId(id);
-                                       }   
-
-                               }
-                       } else {
-                               onapData = (PolicyScopeType)mapper.readValue(root.get("psTypeDictionaryData").toString(), PolicyScopeType.class);
+                       if(fromAPI){
+                               onapData = mapper.readValue(root.get(dictionaryFields).toString(), PolicyScopeType.class);
+                       }else{
+                               onapData = mapper.readValue(root.get("psTypeDictionaryData").toString(), PolicyScopeType.class);
                        }
-                       if(onapData.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeType.class);
-                               if(!duplicateData.isEmpty()){
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeType.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               PolicyScopeType data = (PolicyScopeType) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       onapData.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != onapData.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       commonClassDao.save(onapData);
                                }
-                       }else{
-                               if(!isFakeUpdate) {
+                       }
+                       String responseString = null;
+                       if(!duplicateflag){
+                               if(onapData.getId() == 0){
+                                       commonClassDao.save(onapData);
+                               }else{
                                        commonClassDao.update(onapData); 
-                               }
-                       } 
-                       String responseString = "";
-                       if(duplicateflag){
-                               responseString = "Duplicate";
-                       }else{
+                               } 
                                responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeType.class));
-                       } 
-
-                       if (fromAPI) {
-                               if (responseString!=null && !responseString.equals("Duplicate")) {
-                                       if(isFakeUpdate){
-                                               responseString = "Exists";
-                                       } else {
-                                               responseString = "Success";
-                                       }
-
-                               }
-                               ModelAndView result = new ModelAndView();
-                               result.setViewName(responseString);
-                               return result;
-
-                       } else {
-
-                               response.setCharacterEncoding("UTF-8");
-                               response.setContentType("application / json");
-                               request.setCharacterEncoding("UTF-8");
-
-                               PrintWriter out = response.getWriter();
-                               JSONObject j = new JSONObject("{psTypeDictionaryDatas: " + responseString + "}");
-
-                               out.write(j.toString());
-
-                               return null;
+                       }else{
+                               responseString = duplicateResponseString;
+                       }
+                       if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, psTypeDatas, responseString);
                        }
-
                }catch (Exception e){
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-                       LOGGER.error(e);
+                       utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/ps_dictionary/remove_PSType"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-               try{
-                       ObjectMapper mapper = new ObjectMapper();
-                       mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                       JsonNode root = mapper.readTree(request.getReader());
-                       PolicyScopeType onapData = (PolicyScopeType)mapper.readValue(root.get("data").toString(), PolicyScopeType.class);
-                       commonClassDao.delete(onapData);
-                       response.setCharacterEncoding("UTF-8");
-                       response.setContentType("application / json");
-                       request.setCharacterEncoding("UTF-8");
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeType.class));
-                       JSONObject j = new JSONObject("{psTypeDictionaryDatas: " + responseString + "}");
-                       out.write(j.toString());
-
-                       return null;
-               }
-               catch (Exception e){
-                       System.out.println(e);
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-               }
-               return null;
+       @RequestMapping(value={"/ps_dictionary/remove_PSType"}, method={RequestMethod.POST})
+       public void removePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, psTypeDatas, PolicyScopeType.class);
        }
 
-       @RequestMapping(value={"/get_PSResourceDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getPSResourceEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("psResourceDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(PolicyScopeResource.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);
-               }
+       @RequestMapping(value={"/get_PSResourceDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getPSResourceEntityDataByName(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getDataByEntity(response, psResourceDatas, "name", PolicyScopeResource.class);
        }
 
-       @RequestMapping(value={"/get_PSResourceData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-       public void getPSResourceEntityData(HttpServletRequest request, HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("psResourceDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(PolicyScopeResource.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");
-                       
-               }
+       @RequestMapping(value={"/get_PSResourceData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       public void getPSResourceEntityData(HttpServletResponse response){
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getData(response, psResourceDatas, PolicyScopeResource.class);
        }
 
-       @RequestMapping(value={"/ps_dictionary/save_psResource"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
+       @RequestMapping(value={"/ps_dictionary/save_psResource"}, method={RequestMethod.POST})
+       public ModelAndView savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+               DictionaryUtils utils = getDictionaryUtilsInstance();
                try {
-                       boolean duplicateflag = false;
-                       boolean isFakeUpdate = false;
-                       boolean fromAPI = false;
-                       if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                               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());
                        PolicyScopeResource onapData;
                        if (fromAPI) {
-                               onapData = (PolicyScopeResource)mapper.readValue(root.get("dictionaryFields").toString(), PolicyScopeResource.class);
-
-                               //check if update operation or create, get id for data to be updated and update attributeData
-                               if (request.getParameter("operation").equals("update")) {
-                                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeResource.class);
-                                       int id = 0;
-                                       PolicyScopeResource data = (PolicyScopeResource) duplicateData.get(0);
-                                       id = data.getId();
-
-                                       if(id==0){
-                                               isFakeUpdate=true;
-                                               onapData.setId(1);
-                                       } else {
-                                               onapData.setId(id);
-                                       }
-                               }
+                               onapData = mapper.readValue(root.get(dictionaryFields).toString(), PolicyScopeResource.class);
                        } else {
-                               onapData = (PolicyScopeResource)mapper.readValue(root.get("psResourceDictionaryData").toString(), PolicyScopeResource.class);
+                               onapData = mapper.readValue(root.get("psResourceDictionaryData").toString(), PolicyScopeResource.class);
                        }
-                       if(onapData.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeResource.class);
-                               if(!duplicateData.isEmpty()){
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(onapData.getName(), "name", PolicyScopeResource.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               PolicyScopeResource data = (PolicyScopeResource) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       onapData.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != onapData.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       commonClassDao.save(onapData);
                                }
-                       }else{
-                               if(!isFakeUpdate) {
+                       }
+                       String responseString = null;
+                       if(!duplicateflag){
+                               if(onapData.getId() == 0){
+                                       commonClassDao.save(onapData);
+                               }else{
                                        commonClassDao.update(onapData); 
-                               }
-                       } 
-                       String responseString = "";
-                       if(duplicateflag){
-                               responseString = "Duplicate";
-                       }else{
+                               } 
                                responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeResource.class));
-                       }   
-
-                       if (fromAPI) {
-                               if (responseString!=null && !responseString.equals("Duplicate")) {
-                                       if(isFakeUpdate){
-                                               responseString = "Exists";
-                                       } else {
-                                               responseString = "Success";
-                                       }
-
-                               }
-                               ModelAndView result = new ModelAndView();
-                               result.setViewName(responseString);
-                               return result;
-
-                       } else {
-
-                               response.setCharacterEncoding("UTF-8");
-                               response.setContentType("application / json");
-                               request.setCharacterEncoding("UTF-8");
-
-                               PrintWriter out = response.getWriter();
-                               JSONObject j = new JSONObject("{psResourceDictionaryDatas: " + responseString + "}");
-
-                               out.write(j.toString());
-
-                               return null;
+                       }else{
+                               responseString = duplicateResponseString;
+                       }
+                       if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, psResourceDatas, responseString);
                        }
-
                }catch (Exception e){
-                       LOGGER.error(e);
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-                       
+                       utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/ps_dictionary/remove_PSResource"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-               try{
-                       ObjectMapper mapper = new ObjectMapper();
-                       mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                       JsonNode root = mapper.readTree(request.getReader());
-                       PolicyScopeResource onapData = (PolicyScopeResource)mapper.readValue(root.get("data").toString(), PolicyScopeResource.class);
-                       commonClassDao.delete(onapData);
-                       response.setCharacterEncoding("UTF-8");
-                       response.setContentType("application / json");
-                       request.setCharacterEncoding("UTF-8");
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeResource.class));
-                       JSONObject j = new JSONObject("{psResourceDictionaryDatas: " + responseString + "}");
-                       out.write(j.toString());
-
-                       return null;
-               }
-               catch (Exception e){
-                       System.out.println(e);
-                       response.setCharacterEncoding("UTF-8");
-                       request.setCharacterEncoding("UTF-8");
-                       PrintWriter out = response.getWriter();
-                       out.write(e.getMessage());
-               }
-               return null;
+       @RequestMapping(value={"/ps_dictionary/remove_PSResource"}, method={RequestMethod.POST})
+       public void removePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, psResourceDatas, PolicyScopeResource.class);
        }
 }