Code Clean Up for Policy PAP-REST
[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / controller / ClosedLoopDictionaryController.java
index a55ed40..2b05567 100644 (file)
 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.LinkedHashMap;
 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.adapters.GridData;
 import org.onap.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
-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.ClosedLoopD2Services;
 import org.onap.policy.rest.jpa.ClosedLoopSite;
+import org.onap.policy.rest.jpa.OnapName;
 import org.onap.policy.rest.jpa.PEPOptions;
 import org.onap.policy.rest.jpa.UserInfo;
 import org.onap.policy.rest.jpa.VNFType;
 import org.onap.policy.rest.jpa.VSCLAction;
 import org.onap.policy.rest.jpa.VarbindDictionary;
-import org.onap.policy.utils.PolicyUtils;
-import org.onap.policy.xacml.api.XACMLErrorConstants;
 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;
@@ -60,29 +53,23 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @Controller
 public class ClosedLoopDictionaryController{
 
-       private static final Logger LOGGER = FlexLogger.getLogger(ClosedLoopDictionaryController.class);
-
        private static CommonClassDao commonClassDao;
        private static String vsclaction = "vsclaction";
-       private static String successMapKey = "successMapKey";
-       private static String successMessage = "success";
        private static String operation = "operation";
-       private static String getDictionary = "getDictionary";
-       private static String dictionaryDBQuery = "dictionaryDBQuery";
-       private static String errorMsg  = "error";
        private static String vnftype = "vnftype";
        private static String pepName = "pepName";
        private static String varbindName = "varbindName";
        private static String serviceName = "serviceName";
        private static String siteName = "siteName";
-       private static String apiflag = "apiflag";
        private static String dictionaryFields = "dictionaryFields";
-       private static String update = "update";
        private static String duplicateResponseString = "Duplicate";
        private static String userid = "userid";
-       private static String utf8 = "UTF-8";
-       private static String applicationJsonContentType = "application / json";
-       private static String successMsg = "Success";
+       private static String vsclActionDatas = "vsclActionDictionaryDatas";
+       private static String vnfTypeDatas = "vnfTypeDictionaryDatas";
+       private static String pepOptionDatas = "pepOptionsDictionaryDatas";
+       private static String varbindDatas = "varbindDictionaryDatas";
+       private static String closedLoopDatas = "closedLoopServiceDictionaryDatas";
+       private static String closedLoopSiteDatas = "closedLoopSiteDictionaryDatas";
        
        @Autowired
        public ClosedLoopDictionaryController(CommonClassDao commonClassDao){
@@ -92,966 +79,466 @@ public class ClosedLoopDictionaryController{
        public void setCommonClassDao(CommonClassDao commonClassDao){
                ClosedLoopDictionaryController.commonClassDao = commonClassDao;
        }
-       /*
-        * This is an empty constructor
-        */
-       public ClosedLoopDictionaryController(){}
 
-       public UserInfo getUserInfo(String loginId){
-               return (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
+       public static void setCommonClassDao(CommonClassDaoImpl commonClassDaoImpl) {
+        commonClassDao = commonClassDaoImpl;
+    }
+       
+       public ClosedLoopDictionaryController(){
+               super();
        }
 
-
-       @RequestMapping(value={"/get_VSCLActionDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       private DictionaryUtils getDictionaryUtilsInstance(){
+               return DictionaryUtils.dictionaryUtils != null ? DictionaryUtils.getDictionaryUtils() : new DictionaryUtils();
+       }
+       
+       @RequestMapping(value={"/get_VSCLActionDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getVSCLActionDictionaryByNameEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("vsclActionDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(VSCLAction.class, vsclaction)));
-                       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, vsclActionDatas, vsclaction, VSCLAction.class);
        }
 
 
-       @RequestMapping(value={"/get_VSCLActionData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_VSCLActionData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getVSCLActionDictionaryEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("vsclActionDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(VSCLAction.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, vsclActionDatas, VSCLAction.class);
        }
 
-       @RequestMapping(value={"/get_VNFTypeDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_VNFTypeDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getVNFTypeDictionaryByNameEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("vnfTypeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(VNFType.class, vnftype)));
-                       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);
-               }
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.getDataByEntity(response, vnfTypeDatas, vnftype, VNFType.class);
        }
 
-       @RequestMapping(value={"/get_VNFTypeData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_VNFTypeData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getVNFTypeDictionaryEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("vnfTypeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(VNFType.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, vnfTypeDatas, VNFType.class);
        }
 
-       @RequestMapping(value={"/get_PEPOptionsDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_PEPOptionsDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getPEPOptionsDictionaryByNameEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("pepOptionsDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(PEPOptions.class, pepName)));
-                       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, pepOptionDatas, pepName, PEPOptions.class);
        }
 
-       @RequestMapping(value={"/get_PEPOptionsData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_PEPOptionsData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getPEPOptionsDictionaryEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("pepOptionsDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(PEPOptions.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, pepOptionDatas, PEPOptions.class);
        }
 
-       @RequestMapping(value={"/get_VarbindDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_VarbindDictionaryDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getVarbindDictionaryByNameEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("varbindDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(VarbindDictionary.class, varbindName)));
-                       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, varbindDatas, varbindName, VarbindDictionary.class);
        }
 
-       @RequestMapping(value={"/get_VarbindDictionaryData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_VarbindDictionaryData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getVarbindDictionaryEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("varbindDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(VarbindDictionary.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, varbindDatas, VarbindDictionary.class);
        }
 
-       @RequestMapping(value={"/get_ClosedLoopServicesDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_ClosedLoopServicesDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getClosedLoopServiceDictionaryByNameEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("closedLoopServiceDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(ClosedLoopD2Services.class, serviceName)));
-                       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, closedLoopDatas, serviceName, ClosedLoopD2Services.class);
        }
 
-       @RequestMapping(value={"/get_ClosedLoopServicesData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_ClosedLoopServicesData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getClosedLoopServiceDictionaryEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("closedLoopServiceDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(ClosedLoopD2Services.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, closedLoopDatas, ClosedLoopD2Services.class);
        }
 
-       @RequestMapping(value={"/get_ClosedLoopSiteDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_ClosedLoopSiteDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getClosedLoopSiteDictionaryByNameEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("closedLoopSiteDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(ClosedLoopSite.class, siteName)));
-                       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, closedLoopSiteDatas, siteName, ClosedLoopSite.class);
        }
 
-       @RequestMapping(value={"/get_ClosedLoopSiteData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
+       @RequestMapping(value={"/get_ClosedLoopSiteData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
        public void getClosedLoopSiteDictionaryEntityData(HttpServletResponse response){
-               try{
-                       Map<String, Object> model = new HashMap<>();
-                       ObjectMapper mapper = new ObjectMapper();
-                       model.put("closedLoopSiteDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(ClosedLoopSite.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, closedLoopSiteDatas, ClosedLoopSite.class);
        }
 
-       @RequestMapping(value={"/cl_dictionary/save_vsclAction"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
+       @RequestMapping(value={"/cl_dictionary/save_vsclAction"}, method={RequestMethod.POST})
        public ModelAndView saveVSCLAction(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());
                        VSCLAction vSCLAction;
                        String userId = null;
                        if (fromAPI) {
-                               vSCLAction = (VSCLAction)mapper.readValue(root.get(dictionaryFields).toString(), VSCLAction.class);
+                               vSCLAction = mapper.readValue(root.get(dictionaryFields).toString(), VSCLAction.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<Object> duplicateData =  commonClassDao.checkDuplicateEntry(vSCLAction.getVsclaction(), vsclaction, VSCLAction.class);
-                                       VSCLAction data = (VSCLAction) duplicateData.get(0);
-                                       int id = data.getId();
-                                       if(id==0){
-                                               isFakeUpdate=true;
-                                               vSCLAction.setId(1);
-                                       } else {
-                                               vSCLAction.setId(id);
-                                       }
-
-                                       vSCLAction.setUserCreatedBy(this.getUserInfo(userId));
-                               }
-
                        } else {
-                               vSCLAction = (VSCLAction)mapper.readValue(root.get("vsclActionDictionaryData").toString(), VSCLAction.class);
+                               vSCLAction = mapper.readValue(root.get("vsclActionDictionaryData").toString(), VSCLAction.class);
                                userId = root.get(userid).textValue();
                        }
-                       if(vSCLAction.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(vSCLAction.getVsclaction(), vsclaction, VSCLAction.class);
-                               if(!duplicateData.isEmpty()){
+                       UserInfo userInfo = utils.getUserInfo(userId);
+
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(vSCLAction.getVsclaction(), vsclaction, VSCLAction.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               VSCLAction data = (VSCLAction) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       vSCLAction.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != vSCLAction.getId()))){
                                        duplicateflag = true;
+                               }
+                       }
+                       String responseString = null;
+                       if(!duplicateflag){
+                               vSCLAction.setUserModifiedBy(userInfo);
+                               if(vSCLAction.getId() == 0){
+                                       vSCLAction.setUserCreatedBy(userInfo);
+                                       commonClassDao.save(vSCLAction);
                                }else{
-                                       vSCLAction.setUserCreatedBy(this.getUserInfo(userId));
-                                       vSCLAction.setUserModifiedBy(this.getUserInfo(userId));
                                        vSCLAction.setModifiedDate(new Date());
-                                       commonClassDao.save(vSCLAction);
-                               }
-                       }else{
-                               if(!isFakeUpdate) {
-                                       vSCLAction.setUserModifiedBy(this.getUserInfo(userId));
                                        commonClassDao.update(vSCLAction); 
-                               }
+                               } 
+                               responseString = mapper.writeValueAsString(commonClassDao.getData(VSCLAction.class));
+                       }else{
+                               responseString = duplicateResponseString;
                        }
 
-                       String responseString = "";
-                       if(duplicateflag){
-                               responseString = duplicateResponseString;
+                       if(fromAPI){
+                               return utils.getResultForApi(responseString);
                        }else{
-                               responseString = mapper.writeValueAsString(commonClassDao.getData(VSCLAction.class));
-                       }       
-                       if (fromAPI) {
-                               if (responseString!=null && !(duplicateResponseString).equals(responseString)) {
-                                       if(isFakeUpdate) {
-                                               responseString = "Exists";
-                                       } else {
-                                               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("{vsclActionDictionaryDatas: " + responseString + "}");
-                               out.write(j.toString());
-                               return null;
+                               utils.setResponseData(response, vsclActionDatas, responseString);
                        }
-               }
-               catch (Exception e){
-                       LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-                       response.setCharacterEncoding(utf8);
-                       request.setCharacterEncoding(utf8);
-                       PrintWriter out = response.getWriter();
-                       out.write(PolicyUtils.CATCH_EXCEPTION);
+               }catch(Exception e){
+                       utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/cl_dictionary/remove_VsclAction"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removeVSCLAction(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());
-                       VSCLAction vSCLAction = (VSCLAction)mapper.readValue(root.get("data").toString(), VSCLAction.class);
-                       commonClassDao.delete(vSCLAction);
-                       response.setCharacterEncoding(utf8);
-                       response.setContentType(applicationJsonContentType);
-                       request.setCharacterEncoding(utf8);
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(VSCLAction.class));
-                       JSONObject j = new JSONObject("{vsclActionDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
-               }
-               return null;
+       @RequestMapping(value={"/cl_dictionary/remove_VsclAction"}, method={RequestMethod.POST})
+       public void removeVSCLAction(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, vsclActionDatas, OnapName.class);
        }
 
-       @RequestMapping(value={"/cl_dictionary/save_vnfType"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
+       @RequestMapping(value={"/cl_dictionary/save_vnfType"}, method={RequestMethod.POST})
        public ModelAndView saveVnfType(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());
                        VNFType vNFType;
                        String userId = null;
-
                        if (fromAPI) {
-                               vNFType = (VNFType)mapper.readValue(root.get(dictionaryFields).toString(), VNFType.class);
+                               vNFType = mapper.readValue(root.get(dictionaryFields).toString(), VNFType.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<Object> duplicateData =  commonClassDao.checkDuplicateEntry(vNFType.getVnftype(), vnftype, VNFType.class);
-                                       VNFType data = (VNFType) duplicateData.get(0);
-                                       int id = data.getId();
-                                       if(id==0){
-                                               isFakeUpdate=true;
-                                               vNFType.setId(1);
-                                       } else {
-                                               vNFType.setId(id);
-                                       }
-                                       vNFType.setUserCreatedBy(this.getUserInfo(userId));
-                               }
                        } else {
-                               vNFType = (VNFType)mapper.readValue(root.get("vnfTypeDictionaryData").toString(), VNFType.class);
+                               vNFType = mapper.readValue(root.get("vnfTypeDictionaryData").toString(), VNFType.class);
                                userId = root.get(userid).textValue();
                        }
-                       if(vNFType.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(vNFType.getVnftype(), vnftype, VNFType.class);
-                               if(!duplicateData.isEmpty()){
+                       UserInfo userInfo = utils.getUserInfo(userId);
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(vNFType.getVnftype(), vnftype, VNFType.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               VNFType data = (VNFType) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       vNFType.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != vNFType.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       vNFType.setUserCreatedBy(this.getUserInfo(userId));
-                                       vNFType.setUserModifiedBy(this.getUserInfo(userId));
+                               }
+                       }
+                       String responseString = null;
+                       if(!duplicateflag){
+                               vNFType.setUserModifiedBy(userInfo);
+                               if(vNFType.getId() == 0){
+                                       vNFType.setUserCreatedBy(userInfo);
                                        commonClassDao.save(vNFType);
-                               }        
-                       }else{
-                               if(!isFakeUpdate) {
-                                       vNFType.setUserModifiedBy(this.getUserInfo(userId));
+                               }else{
                                        vNFType.setModifiedDate(new Date());
                                        commonClassDao.update(vNFType); 
-                               }
-                       } 
-                       String responseString = "";
-                       if(duplicateflag){
+                               } 
+                               responseString = mapper.writeValueAsString(commonClassDao.getData(VNFType.class));
+                       }else{
                                responseString = duplicateResponseString;
+                       }
+        
+                       if(fromAPI){
+                               return utils.getResultForApi(responseString);
                        }else{
-                               responseString = mapper.writeValueAsString(commonClassDao.getData(VNFType.class));
-                       } 
-                       if (fromAPI) {
-                               if (responseString!=null && !(duplicateResponseString).equals(responseString)) {
-                                       if(isFakeUpdate) {
-                                               responseString = "Exists";
-                                       } else {
-                                               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("{vnfTypeDictionaryDatas: " + responseString + "}");
-                               out.write(j.toString()); 
-                               return null;
+                               utils.setResponseData(response, vnfTypeDatas, responseString);
                        }
-               } 
-               catch (Exception e){
-                       LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-                       response.setCharacterEncoding(utf8);
-                       request.setCharacterEncoding(utf8);
-                       PrintWriter out = response.getWriter();
-                       out.write(PolicyUtils.CATCH_EXCEPTION);
+               }catch(Exception e){
+                       utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/cl_dictionary/remove_vnfType"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removeVnfType(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());
-                       VNFType vNFType = (VNFType)mapper.readValue(root.get("data").toString(), VNFType.class);
-                       commonClassDao.delete(vNFType);
-                       response.setCharacterEncoding(utf8);
-                       response.setContentType(applicationJsonContentType);
-                       request.setCharacterEncoding(utf8);
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(VNFType.class));
-                       JSONObject j = new JSONObject("{vnfTypeDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
-               }
-               return null;
+       @RequestMapping(value={"/cl_dictionary/remove_vnfType"}, method={RequestMethod.POST})
+       public void removeVnfType(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, vnfTypeDatas, VNFType.class);
        }
 
-       @RequestMapping(value={"/cl_dictionary/save_pepOptions"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
+       @RequestMapping(value={"/cl_dictionary/save_pepOptions"}, method={RequestMethod.POST})
        public ModelAndView savePEPOptions(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());
             PEPOptions pEPOptions;
             GridData gridData;
             String userId = null;
-            if (fromAPI) {
-                pEPOptions = (PEPOptions)mapper.readValue(root.get(dictionaryFields).toString(), PEPOptions.class);
-                gridData = (GridData)mapper.readValue(root.get(dictionaryFields).toString(), GridData.class);
+            if(fromAPI){
+                pEPOptions = mapper.readValue(root.get(dictionaryFields).toString(), PEPOptions.class);
+                gridData = mapper.readValue(root.get(dictionaryFields).toString(), GridData.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<Object> duplicateData =  commonClassDao.checkDuplicateEntry(pEPOptions.getPepName(), pepName, PEPOptions.class);
-                    PEPOptions data = (PEPOptions) duplicateData.get(0);
-                    int id = data.getId();
-                    if(id==0){
-                        isFakeUpdate=true;
-                        pEPOptions.setId(1);
-                    } else {
-                        pEPOptions.setId(id);
-                    }
-                    pEPOptions.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-               pEPOptions = (PEPOptions)mapper.readValue(root.get("pepOptionsDictionaryData").toString(), PEPOptions.class);
-               gridData = (GridData)mapper.readValue(root.get("pepOptionsDictionaryData").toString(), GridData.class);
+            }else{
+               pEPOptions = mapper.readValue(root.get("pepOptionsDictionaryData").toString(), PEPOptions.class);
+               gridData = mapper.readValue(root.get("pepOptionsDictionaryData").toString(), GridData.class);
                userId = root.get(userid).textValue();
             }
-                       String actions = "";
-                       int counter = 0;
+            UserInfo userInfo = utils.getUserInfo(userId);
+            
                        if(!gridData.getAttributes().isEmpty()){
-                               for(Object attribute : gridData.getAttributes()){
-                                       if(attribute instanceof LinkedHashMap<?, ?>){
-                                               String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-                                               String value = ((LinkedHashMap<?, ?>) attribute).get("number").toString();
-                                               if(counter>0){
-                                                       actions = actions + ":#@";
-                                               }
-                                               actions = actions + key + "=#@";
-                                               actions = actions + value;
-                                               counter ++;
-                                       }
-                               }
+                               pEPOptions.setActions(utils.appendKeyValue(gridData.getAttributes(), ":#@", "=#@"));
                        }
-                       pEPOptions.setActions(actions);
-                       if(pEPOptions.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(pEPOptions.getPepName(), pepName, PEPOptions.class);
-                               if(!duplicateData.isEmpty()){
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(pEPOptions.getPepName(), pepName, PEPOptions.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               PEPOptions data = (PEPOptions) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       pEPOptions.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != pEPOptions.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       pEPOptions.setUserCreatedBy(this.getUserInfo(userId));
-                                       pEPOptions.setUserModifiedBy(this.getUserInfo(userId));
+                               }
+                       }
+                       String responseString = null;
+                       if(!duplicateflag){
+                               pEPOptions.setUserModifiedBy(userInfo);
+                               if(pEPOptions.getId() == 0){
+                                       pEPOptions.setUserCreatedBy(userInfo);
                                        commonClassDao.save(pEPOptions);
-                               }        
-                       }else{
-                               if(!isFakeUpdate){
-                                       pEPOptions.setUserModifiedBy(this.getUserInfo(userId));
+                               }else{
                                        pEPOptions.setModifiedDate(new Date());
-                                       commonClassDao.update(pEPOptions);
-                               }
+                                       commonClassDao.update(pEPOptions); 
+                               } 
+                               responseString = mapper.writeValueAsString(commonClassDao.getData(PEPOptions.class));
+                       }else{
+                               responseString = duplicateResponseString;
                        }
-            String responseString = "";
-            if(duplicateflag){
-                responseString = duplicateResponseString;
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(PEPOptions.class));
-            } 
-            if (fromAPI) {
-                if (responseString!=null && !(duplicateResponseString).equals(responseString)) {
-                    if(isFakeUpdate){
-                        responseString = "Exists";
-                    } else {
-                        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("{pepOptionsDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
+                       
+                       if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, pepOptionDatas, responseString);
+                       }
+        }catch(Exception e){
+               utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/cl_dictionary/remove_pepOptions"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removePEPOptions(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());
-                       PEPOptions pEPOptions = (PEPOptions)mapper.readValue(root.get("data").toString(), PEPOptions.class);
-                       commonClassDao.delete(pEPOptions);
-                       response.setCharacterEncoding(utf8);
-                       response.setContentType(applicationJsonContentType);
-                       request.setCharacterEncoding(utf8);
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(PEPOptions.class));
-                       JSONObject j = new JSONObject("{pepOptionsDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
-               }
-               return null;
+       @RequestMapping(value={"/cl_dictionary/remove_pepOptions"}, method={RequestMethod.POST})
+       public void removePEPOptions(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, pepOptionDatas, VNFType.class);
        }
 
-       @RequestMapping(value={"/cl_dictionary/save_service"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
+       @RequestMapping(value={"/cl_dictionary/save_service"}, method={RequestMethod.POST})
        public ModelAndView saveServiceType(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());
             ClosedLoopD2Services serviceData;
             String userId = null;
-            if (fromAPI) {
-                serviceData = (ClosedLoopD2Services)mapper.readValue(root.get(dictionaryFields).toString(), ClosedLoopD2Services.class);
+            if(fromAPI){
+                serviceData = mapper.readValue(root.get(dictionaryFields).toString(), ClosedLoopD2Services.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<Object> duplicateData =  commonClassDao.checkDuplicateEntry(serviceData.getServiceName(), serviceName, ClosedLoopD2Services.class);
-                    ClosedLoopD2Services data = (ClosedLoopD2Services) duplicateData.get(0);
-                    int id = data.getId();
-                    if(id==0){
-                        isFakeUpdate=true;
-                        serviceData.setId(1);
-                    } else {
-                        serviceData.setId(id);
-                    }
-                    serviceData.setUserCreatedBy(this.getUserInfo(userId));
-                }
             } else {
-               serviceData = (ClosedLoopD2Services)mapper.readValue(root.get("closedLoopServiceDictionaryData").toString(), ClosedLoopD2Services.class);
+               serviceData = mapper.readValue(root.get("closedLoopServiceDictionaryData").toString(), ClosedLoopD2Services.class);
                userId = root.get(userid).textValue();
             }
-                       if(serviceData.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(serviceData.getServiceName(), serviceName, ClosedLoopD2Services.class);
-                               if(!duplicateData.isEmpty()){
+            UserInfo userInfo = utils.getUserInfo(userId);
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(serviceData.getServiceName(), serviceName, ClosedLoopD2Services.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               ClosedLoopD2Services data = (ClosedLoopD2Services) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       serviceData.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != serviceData.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       serviceData.setUserCreatedBy(this.getUserInfo(userId));
-                                       serviceData.setUserModifiedBy(this.getUserInfo(userId));
-                                       commonClassDao.save(serviceData);
                                }
-                       }else{
-                               if(!isFakeUpdate){
-                                       serviceData.setUserModifiedBy(this.getUserInfo(userId));
+                       }
+                       String responseString = null;
+                       if(!duplicateflag){
+                               serviceData.setUserModifiedBy(userInfo);
+                               if(serviceData.getId() == 0){
+                                       serviceData.setUserCreatedBy(userInfo);
+                                       commonClassDao.save(serviceData);
+                               }else{
                                        serviceData.setModifiedDate(new Date());
                                        commonClassDao.update(serviceData); 
-                               }
+                               } 
+                               responseString = mapper.writeValueAsString(commonClassDao.getData(ClosedLoopD2Services.class));
+                       }else{
+                               responseString = duplicateResponseString;
                        }
-            String responseString = "";
-            if(duplicateflag){
-                responseString = duplicateResponseString;
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(ClosedLoopD2Services.class));
-            } 
-            if (fromAPI) {
-                if (responseString!=null && !(duplicateResponseString).equals(responseString)) {
-                    if(isFakeUpdate){
-                        responseString = "Exists";
-                    } else {
-                        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("{closedLoopServiceDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
+            if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, closedLoopDatas, responseString);
+                       }
+        }catch(Exception e){
+               utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/cl_dictionary/remove_Service"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removeServiceType(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());
-                       ClosedLoopD2Services closedLoopD2Services = (ClosedLoopD2Services)mapper.readValue(root.get("data").toString(), ClosedLoopD2Services.class);
-                       commonClassDao.delete(closedLoopD2Services);
-                       response.setCharacterEncoding(utf8);
-                       response.setContentType(applicationJsonContentType);
-                       request.setCharacterEncoding(utf8);
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(ClosedLoopD2Services.class));
-                       JSONObject j = new JSONObject("{closedLoopServiceDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
-               }
-               return null;
+       @RequestMapping(value={"/cl_dictionary/remove_Service"}, method={RequestMethod.POST})
+       public void removeServiceType(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, closedLoopDatas, VNFType.class);
        }
 
-       @RequestMapping(value={"/cl_dictionary/save_siteName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
+       @RequestMapping(value={"/cl_dictionary/save_siteName"}, method={RequestMethod.POST})
        public ModelAndView saveSiteType(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());
             ClosedLoopSite siteData;
             String userId = null;
-            if (fromAPI) {
-                siteData = (ClosedLoopSite)mapper.readValue(root.get(dictionaryFields).toString(), ClosedLoopSite.class);
+            if(fromAPI){
+                siteData = mapper.readValue(root.get(dictionaryFields).toString(), ClosedLoopSite.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<Object> duplicateData =  commonClassDao.checkDuplicateEntry(siteData.getSiteName(), siteName, ClosedLoopSite.class);
-                    ClosedLoopSite data = (ClosedLoopSite) duplicateData.get(0);
-                    int id = data.getId();
-                    if(id==0){
-                        isFakeUpdate=true;
-                        siteData.setId(1);
-                    } else {
-                        siteData.setId(id);
-                    }
-                    siteData.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-               siteData = (ClosedLoopSite)mapper.readValue(root.get("closedLoopSiteDictionaryData").toString(), ClosedLoopSite.class);
+            }else{
+               siteData = mapper.readValue(root.get("closedLoopSiteDictionaryData").toString(), ClosedLoopSite.class);
                userId = root.get(userid).textValue();
             }
-                       if(siteData.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(siteData.getSiteName(), siteName, ClosedLoopSite.class);
-                               if(!duplicateData.isEmpty()){
+            UserInfo userInfo = utils.getUserInfo(userId);
+            
+            List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(siteData.getSiteName(), siteName, ClosedLoopSite.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               ClosedLoopSite data = (ClosedLoopSite) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       siteData.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != siteData.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       siteData.setUserCreatedBy(this.getUserInfo(userId));
-                                       siteData.setUserModifiedBy(this.getUserInfo(userId));
-                                       commonClassDao.save(siteData);
                                }
-                       }else{
-                               if(!isFakeUpdate) {
-                                       siteData.setUserModifiedBy(this.getUserInfo(userId));
+                       }
+            String responseString = null;
+                       if(!duplicateflag){
+                               siteData.setUserModifiedBy(userInfo);
+                               if(siteData.getId() == 0){
+                                       siteData.setUserCreatedBy(userInfo);
+                                       commonClassDao.save(siteData);
+                               }else{
                                        siteData.setModifiedDate(new Date());
-                                       commonClassDao.update(siteData);
-                               }
+                                       commonClassDao.update(siteData); 
+                               } 
+                               responseString = mapper.writeValueAsString(commonClassDao.getData(ClosedLoopSite.class));
+                       }else{
+                               responseString = duplicateResponseString;
+                       }
+            if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, closedLoopSiteDatas, responseString);
                        }
-            String responseString = "";
-            if(duplicateflag){
-                responseString = duplicateResponseString;
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(ClosedLoopSite.class));
-            }   
-            
-            if (fromAPI) {
-                if (responseString!=null && !(duplicateResponseString).equals(responseString)) {
-                    if(isFakeUpdate){
-                        responseString = "Exists";
-                    } else {
-                        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("{closedLoopSiteDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
+               utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/cl_dictionary/remove_site"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removeSiteType(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());
-                       ClosedLoopSite closedLoopSite = (ClosedLoopSite)mapper.readValue(root.get("data").toString(), ClosedLoopSite.class);
-                       commonClassDao.delete(closedLoopSite);
-                       response.setCharacterEncoding(utf8);
-                       response.setContentType(applicationJsonContentType);
-                       request.setCharacterEncoding(utf8);
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(ClosedLoopSite.class));
-                       JSONObject j = new JSONObject("{closedLoopSiteDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
-               }
-               return null;
+       @RequestMapping(value={"/cl_dictionary/remove_site"}, method={RequestMethod.POST})
+       public void removeSiteType(HttpServletRequest request, HttpServletResponse response) throws IOException {
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, closedLoopSiteDatas, VNFType.class);
        }
 
-       @RequestMapping(value={"/cl_dictionary/save_varbind"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
+       @RequestMapping(value={"/cl_dictionary/save_varbind"}, method={RequestMethod.POST})
        public ModelAndView saveVarbind(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());
             VarbindDictionary varbindDictionary;
             String userId = null;
-            if (fromAPI) {
-                varbindDictionary = (VarbindDictionary)mapper.readValue(root.get(dictionaryFields).toString(), VarbindDictionary.class);
+            if(fromAPI){
+                varbindDictionary = mapper.readValue(root.get(dictionaryFields).toString(), VarbindDictionary.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<Object> duplicateData =  commonClassDao.checkDuplicateEntry(varbindDictionary.getVarbindName(), varbindName, VarbindDictionary.class);
-                    VarbindDictionary data = (VarbindDictionary) duplicateData.get(0);
-                    int id = data.getId();
-                    if(id==0){
-                        isFakeUpdate=true;
-                        varbindDictionary.setId(1);
-                    } else {
-                        varbindDictionary.setId(id);
-                    }
-                    varbindDictionary.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-               varbindDictionary = (VarbindDictionary)mapper.readValue(root.get("varbindDictionaryData").toString(), VarbindDictionary.class);
+            }else{
+               varbindDictionary = mapper.readValue(root.get("varbindDictionaryData").toString(), VarbindDictionary.class);
                userId = root.get(userid).textValue();
             }
-                       if(varbindDictionary.getId() == 0){
-                               List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(varbindDictionary.getVarbindName(), varbindName, VarbindDictionary.class);
-                               if(!duplicateData.isEmpty()){
+            UserInfo userInfo = utils.getUserInfo(userId);
+                       
+                       List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(varbindDictionary.getVarbindName(), varbindName, VarbindDictionary.class);
+                       boolean duplicateflag = false;
+                       if(!duplicateData.isEmpty()){
+                               VarbindDictionary data = (VarbindDictionary) duplicateData.get(0);
+                               if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){
+                                       varbindDictionary.setId(data.getId());
+                               }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || 
+                                               (request.getParameter(operation) == null && (data.getId() != varbindDictionary.getId()))){
                                        duplicateflag = true;
-                               }else{
-                                       varbindDictionary.setUserCreatedBy(this.getUserInfo(userId));
-                                       varbindDictionary.setUserModifiedBy(this.getUserInfo(userId));
+                               }
+                       }
+                       
+                       String responseString = null;
+                       if(!duplicateflag){
+                               varbindDictionary.setUserModifiedBy(userInfo);
+                               if(varbindDictionary.getId() == 0){
+                                       varbindDictionary.setUserCreatedBy(userInfo);
                                        commonClassDao.save(varbindDictionary);
-                               }         
-                       }else{
-                               if(!isFakeUpdate){
-                                       varbindDictionary.setUserModifiedBy(this.getUserInfo(userId));
+                               }else{
                                        varbindDictionary.setModifiedDate(new Date());
-                                       commonClassDao.update(varbindDictionary);
-                               }
+                                       commonClassDao.update(varbindDictionary); 
+                               } 
+                               responseString = mapper.writeValueAsString(commonClassDao.getData(VarbindDictionary.class));
+                       }else{
+                               responseString = duplicateResponseString;
+                       }            
+            if(fromAPI){
+                               return utils.getResultForApi(responseString);
+                       }else{
+                               utils.setResponseData(response, varbindDatas, responseString);
                        }
-            String responseString = "";
-            if(duplicateflag){
-                responseString = duplicateResponseString;
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(VarbindDictionary.class));
-            }
-            
-            if (fromAPI) {
-                if (responseString!=null && !(duplicateResponseString).equals(responseString)) {
-                    if(isFakeUpdate){
-                        responseString = "Exists";
-                    } else {
-                        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("{varbindDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
+               utils.setErrorResponseData(response, e);
                }
                return null;
        }
 
-       @RequestMapping(value={"/cl_dictionary/remove_varbindDict"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-       public ModelAndView removeVarbind(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());
-                       VarbindDictionary varbindDictionary = (VarbindDictionary)mapper.readValue(root.get("data").toString(), VarbindDictionary.class);
-                       commonClassDao.delete(varbindDictionary);
-                       response.setCharacterEncoding(utf8);
-                       response.setContentType(applicationJsonContentType);
-                       request.setCharacterEncoding(utf8);
-
-                       PrintWriter out = response.getWriter();
-
-                       String responseString = mapper.writeValueAsString(commonClassDao.getData(VarbindDictionary.class));
-                       JSONObject j = new JSONObject("{varbindDictionaryDatas: " + 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(PolicyUtils.CATCH_EXCEPTION);
-               }
-               return null;
+       @RequestMapping(value={"/cl_dictionary/remove_varbindDict"}, method={RequestMethod.POST})
+       public void removeVarbind(HttpServletRequest request, HttpServletResponse response) throws IOException{
+               DictionaryUtils utils = getDictionaryUtilsInstance();
+               utils.removeData(request, response, varbindDatas, VNFType.class);
        }
-       
-    public static void setCommonClassDao(CommonClassDaoImpl commonClassDaoImpl) {
-        commonClassDao = commonClassDaoImpl;
-    }
-
-}
-
+}
\ No newline at end of file