[POLICY-73] replace openecomp for policy-engine

Change-Id: I54072f6bcd388c0e05562614ee89b4ae7ad67004
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

14 files changed, 0 insertions, 8534 deletions

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
deleted file mode 100644
index 3ddeee32e..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ActionPolicyDictionaryController.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-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.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionPolicyDict;
-import org.openecomp.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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class ActionPolicyDictionaryController {
-
-	private static final Logger LOGGER  = FlexLogger.getLogger(ActionPolicyDictionaryController.class);
-
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public ActionPolicyDictionaryController(CommonClassDao commonClassDao){
-		ActionPolicyDictionaryController.commonClassDao = commonClassDao;
-	}
-	
-	public ActionPolicyDictionaryController(){}
-
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;	
-	}
-
-	@RequestMapping(value={"/get_ActionPolicyDictDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getActionEntitybyName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("actionPolicyDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(ActionPolicyDict.class, "attributeName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(e.getMessage());
-		}
-	}
-
-	@RequestMapping(value={"/get_ActionPolicyDictData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getActionPolicyDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("actionPolicyDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(ActionPolicyDict.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.getMessage());
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/action_dictionary/save_ActionDict"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			ActionPolicyDict actionPolicyDict = null;
-			ActionAdapter adapter = null;
-			String userId = null;
-
-			if(fromAPI) {
-				actionPolicyDict = (ActionPolicyDict)mapper.readValue(root.get("dictionaryFields").toString(), ActionPolicyDict.class);
-				adapter = (ActionAdapter)mapper.readValue(root.get("dictionaryFields").toString(), ActionAdapter.class);
-				userId = "API";
-
-				//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(actionPolicyDict.getAttributeName(), "attributeName", ActionPolicyDict.class);
-					int id = 0;
-					ActionPolicyDict data = (ActionPolicyDict) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						actionPolicyDict.setId(1);
-					} else {
-						actionPolicyDict.setId(id);
-					}
-					actionPolicyDict.setUserCreatedBy(this.getUserInfo(userId));
-				}
-			} else {
-				actionPolicyDict = (ActionPolicyDict)mapper.readValue(root.get("actionPolicyDictionaryData").toString(), ActionPolicyDict.class);
-				adapter = mapper.readValue(root.get("actionPolicyDictionaryData").toString(), ActionAdapter.class);
-				userId = root.get("userid").textValue();
-			}
-			String header = "";
-			int counter = 0;
-			if(adapter.getHeaders().size() > 0){
-				for(Object attribute : adapter.getHeaders()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						String value = ((LinkedHashMap<?, ?>) attribute).get("number").toString();
-						if(counter>0){
-							header = header + ":";
-						}
-						header = header + key + "=";
-						header = header + value;
-						counter ++;
-					}
-				}
-			}
-			actionPolicyDict.setHeader(header);
-			if(actionPolicyDict.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(actionPolicyDict.getAttributeName(), "attributeName", ActionPolicyDict.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					actionPolicyDict.setUserCreatedBy(this.getUserInfo(userId));
-					actionPolicyDict.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(actionPolicyDict);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					actionPolicyDict.setUserModifiedBy(this.getUserInfo(userId));
-					actionPolicyDict.setModifiedDate(new Date());
-					commonClassDao.update(actionPolicyDict); 
-				}
-			} 
-
-			String responseString = null;
-			if(duplicateflag) {
-				responseString = "Duplicate";
-			} else {
-				responseString = mapper.writeValueAsString(commonClassDao.getData(ActionPolicyDict.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("{actionPolicyDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-
-				return null;
-			}
-		}
-		catch (Exception e){
-			LOGGER.error(e.getMessage());
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/action_dictionary/remove_actionPolicyDict"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			ActionPolicyDict actionPolicyDict = (ActionPolicyDict)mapper.readValue(root.get("data").toString(), ActionPolicyDict.class);
-			commonClassDao.delete(actionPolicyDict);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(ActionPolicyDictionaryController.commonClassDao.getData(ActionPolicyDict.class));
-			JSONObject j = new JSONObject("{actionPolicyDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(e.getMessage());
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-}
-
-class ActionAdapter{
-	private ArrayList<Object> headers;
-
-	public ArrayList<Object> getHeaders() {
-		return headers;
-	}
-
-	public void setHeaders(ArrayList<Object> headers) {
-		this.headers = headers;
-	}
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
deleted file mode 100644
index 4dda095d4..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/BRMSDictionaryController.java
+++ /dev/null
@@ -1,552 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.IOUtils;
-import org.json.JSONObject;
-import org.openecomp.policy.api.PEDependency;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.BRMSController;
-import org.openecomp.policy.rest.jpa.BRMSDependency;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-
-@Controller
-public class BRMSDictionaryController{
-	
-	private static final Logger LOGGER  = FlexLogger.getLogger(BRMSDictionaryController.class);
-
-	
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public BRMSDictionaryController(CommonClassDao commonClassDao){
-		BRMSDictionaryController.commonClassDao = commonClassDao;
-	}
-	
-	public BRMSDictionaryController() {}
-
-	private String rule;
-	
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;	
-	}
-
-	@RequestMapping(value={"/get_BRMSParamDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getBRMSParamDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("brmsParamDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(BRMSParamTemplate.class, "ruleName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-	
-	@RequestMapping(value={"/get_BRMSParamData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getBRMSParamDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("brmsParamDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(BRMSParamTemplate.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-            response.addHeader("successMapKey", "success"); 
-            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("error", "dictionaryDBQuery");
-		}
-	}
-	
-	@RequestMapping(value={"/brms_dictionary/set_BRMSParamData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public void SetRuleData(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		StringWriter writer = new StringWriter();
-		IOUtils.copy(request.getInputStream() , writer, StandardCharsets.UTF_8);
-		String cleanStreamBoundary =  writer.toString().replaceFirst("------(.*)(?s).*octet-stream", "");
-		rule = cleanStreamBoundary.substring(0, cleanStreamBoundary.lastIndexOf("end")+4);
-	}
-	
-	@RequestMapping(value={"/brms_dictionary/save_BRMSParam"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			
-            BRMSParamTemplate bRMSParamTemplateData;
-            String userId = null;
-            if(fromAPI) {
-                bRMSParamTemplateData = (BRMSParamTemplate)mapper.readValue(root.get("dictionaryFields").toString(), BRMSParamTemplate.class);
-                userId = "API";
-                
-                //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(bRMSParamTemplateData.getRuleName(), "ruleName", BRMSParamTemplate.class);
-                	int id = 0;
-                	BRMSParamTemplate data = (BRMSParamTemplate) duplicateData.get(0);
-                	id = data.getId();
-                	bRMSParamTemplateData.setId(id);
-                	bRMSParamTemplateData.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-                bRMSParamTemplateData = (BRMSParamTemplate)mapper.readValue(root.get("brmsParamDictionaryData").toString(), BRMSParamTemplate.class);
-                userId = root.get("userid").textValue();
-            }
-            
-			bRMSParamTemplateData.setRule(rule);
-			if(bRMSParamTemplateData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(bRMSParamTemplateData.getRuleName(), "ruleName", BRMSParamTemplate.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					bRMSParamTemplateData.setUserCreatedBy(this.getUserInfo(userId));
-					commonClassDao.save(bRMSParamTemplateData);
-				}	
-			}else{
-				commonClassDao.update(bRMSParamTemplateData); 
-			} 
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(BRMSDictionaryController.commonClassDao.getData(BRMSParamTemplate.class));
-			}
-            if(fromAPI) {
-                if (responseString!=null && !responseString.equals("Duplicate")) {
-                    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("{brmsParamDictionaryDatas: " + responseString + "}");
-            	out.write(j.toString());
-            	return null;
-            }
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/brms_dictionary/remove_brmsParam"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			BRMSParamTemplate bRMSParamTemplateData = (BRMSParamTemplate)mapper.readValue(root.get("data").toString(), BRMSParamTemplate.class);
-			commonClassDao.delete(bRMSParamTemplateData);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(BRMSDictionaryController.commonClassDao.getData(BRMSParamTemplate.class));
-			JSONObject j = new JSONObject("{brmsParamDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-	
-    @RequestMapping(value={"/get_BRMSDependencyDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getBRMSDependencyDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            model.put("brmsDependencyDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(BRMSDependency.class, "dependencyName")));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.getWriter().write(j.toString());
-        }
-        catch (Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-        }
-    }
-    
-    @RequestMapping(value={"/get_BRMSDependencyData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getBRMSDependencyDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            model.put("brmsDependencyDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(BRMSDependency.class)));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.addHeader("successMapKey", "success"); 
-            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("error", "dictionaryDBQuery");
-        }
-    }
-    
-    @RequestMapping(value={"/brms_dictionary/save_BRMSDependencyData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-    public ModelAndView saveBRMSDependencyDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-        try {
-            boolean duplicateflag = false;
-            LOGGER.debug("DictionaryController:  saveBRMSDependencyDictionary() is called");
-            
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-            
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            JsonNode root = mapper.readTree(request.getReader());
-            
-            BRMSDependency brmsDependency;
-            String userId = null;
-            if (fromAPI) {
-                brmsDependency = (BRMSDependency)mapper.readValue(root.get("dictionaryFields").toString(), BRMSDependency.class);
-                userId = "API";
-                
-                //check if update operation or create, get id for data to be updated
-                if (request.getParameter("operation").equals("update")) {
-                	List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(brmsDependency.getDependencyName(), "dependencyName", BRMSDependency.class);
-                	int id = 0;
-                	BRMSDependency data = (BRMSDependency) duplicateData.get(0);
-                	id = data.getId();
-                	brmsDependency.setId(id);
-                	brmsDependency.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-                brmsDependency = (BRMSDependency)mapper.readValue(root.get("brmsDependencyDictionaryData").toString(), BRMSDependency.class);
-                userId = root.get("userid").textValue();
-            }
-            
-            LOGGER.audit("the userId from the ecomp portal is: " + userId);
-            String responseString = null;
-            
-            if(brmsDependency.getDependency()!=null && !brmsDependency.getDependency().trim().equals("")){
-                PEDependency dependency = null;
-                try{
-                    dependency = PolicyUtils.jsonStringToObject(brmsDependency.getDependency(), PEDependency.class);
-                }catch(Exception e){
-                    LOGGER.error(XACMLErrorConstants.ERROR_SCHEMA_INVALID + "wrong data given for BRMS PEDependency Dictionary : " + brmsDependency.getDependency());
-                }
-                if(dependency==null){
-                    responseString = "Error";
-                }else{
-                    if(brmsDependency.getId() == 0){
-                        List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(brmsDependency.getDependencyName(), "dependencyName", BRMSDependency.class);
-                        if(!duplicateData.isEmpty()){
-                            duplicateflag = true;
-                        }else{
-                            brmsDependency.setUserCreatedBy(getUserInfo(userId));
-                            brmsDependency.setUserModifiedBy(getUserInfo(userId));
-                            LOGGER.audit("DictionaryController:  got the user info now about to call Save() method on brmsDependencydao");
-                            commonClassDao.save(brmsDependency);
-                        }
-                    }else{
-                        brmsDependency.setUserModifiedBy(this.getUserInfo(userId));
-                        brmsDependency.setModifiedDate(new Date());
-                        commonClassDao.update(brmsDependency); 
-                    }
-                    if(duplicateflag) {
-                        responseString = "Duplicate";
-                    } else {
-                        responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSDependency.class));
-                    }
-                }
-            }
-            if (fromAPI) {
-                if (responseString!=null && !responseString.equals("Duplicate") && !responseString.equals("Error")) {
-                    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("{brmsDependencyDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
- 
-                return null;
-            }
-        } catch (Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setCharacterEncoding("UTF-8");
-            request.setCharacterEncoding("UTF-8");
-            PrintWriter out = response.getWriter();
-            out.write(e.getMessage());
-        }
-        return null;
-    }
- 
-    @RequestMapping(value={"/brms_dictionary/remove_brmsDependency"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-    public ModelAndView removeBRMSDependencyDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        try{
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            JsonNode root = mapper.readTree(request.getReader());
-            BRMSDependency brmsDependency = (BRMSDependency)mapper.readValue(root.get("data").toString(), BRMSDependency.class);
-            commonClassDao.delete(brmsDependency);
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application / json");
-            request.setCharacterEncoding("UTF-8");
-            PrintWriter out = response.getWriter();
-            String responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSDependency.class));
-            JSONObject j = new JSONObject("{brmsDependencyDictionaryDatas: " + responseString + "}");
-            out.write(j.toString());
-            return null;
-        }
-        catch (Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setCharacterEncoding("UTF-8");
-            request.setCharacterEncoding("UTF-8");
-            PrintWriter out = response.getWriter();
-            out.write(e.getMessage());
-        }
-        return null;
-    }
-    
-    
-    @RequestMapping(value={"/get_BRMSControllerDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getBRMSControllerDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            model.put("brmsControllerDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(BRMSController.class, "controllerName")));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.getWriter().write(j.toString());
-        }
-        catch (Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-        }
-    }
-    
-    @RequestMapping(value={"/get_BRMSControllerData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getBRMSControllerDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            model.put("brmsControllerDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(BRMSController.class)));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.addHeader("successMapKey", "success"); 
-            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("error", "dictionaryDBQuery");
-        }
-    }
-    
-    @RequestMapping(value={"/brms_dictionary/save_BRMSControllerData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-    public ModelAndView saveBRMSControllerDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-        try {
-            boolean duplicateflag = false;
-            LOGGER.debug("DictionaryController:  saveBRMSControllerDictionary() is called");
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            JsonNode root = mapper.readTree(request.getReader());
-            BRMSController brmsController;
-            String userId = null;
-            if (fromAPI) {
-                brmsController = (BRMSController)mapper.readValue(root.get("dictionaryFields").toString(), BRMSController.class);
-                userId = "API";
-                //check if update operation or create, get id for data to be updated
-                if (request.getParameter("operation").equals("update")) {
-                	List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(brmsController.getControllerName(), "controllerName", BRMSController.class);
-                	int id = 0;
-                	BRMSController data = (BRMSController) duplicateData.get(0);
-                	id = data.getId();
-                	brmsController.setId(id);
-                	brmsController.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-                brmsController = (BRMSController)mapper.readValue(root.get("brmsControllerDictionaryData").toString(), BRMSController.class);
-                userId = root.get("userid").textValue();
-            }
-            LOGGER.audit("the userId from the ecomp portal is: " + userId);
-            String responseString = null;
-            if(brmsController.getController()!=null && !brmsController.getController().trim().equals("")){
-                PEDependency dependency = null;
-                try{
-                    dependency = PolicyUtils.jsonStringToObject(brmsController.getController(), PEDependency.class);
-                }catch(Exception e){
-                    LOGGER.error(XACMLErrorConstants.ERROR_SCHEMA_INVALID + "wrong data given for BRMS Controller Dictionary : " + brmsController.getController());
-                }
-                if(dependency==null){
-                    responseString = "Error";
-                }else{
-                    if(brmsController.getId() == 0){
-                        List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(brmsController.getControllerName(), "controllerName", BRMSController.class);
-                        if(!duplicateData.isEmpty()){
-                            duplicateflag = true;
-                        }else{
-                            brmsController.setUserCreatedBy(getUserInfo(userId));
-                            brmsController.setUserModifiedBy(getUserInfo(userId));
-                            LOGGER.audit("DictionaryController:  got the user info now about to call Save() method on brmsControllerdao");
-                            commonClassDao.save(brmsController);
-                        }
-                    }else{
-                        brmsController.setUserModifiedBy(this.getUserInfo(userId));
-                        brmsController.setModifiedDate(new Date());
-                        commonClassDao.update(brmsController); 
-                    }
-                    if(duplicateflag) {
-                        responseString = "Duplicate";
-                    } else {
-                        responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSController.class));
-                    }
-                }
-            }
-            if (fromAPI) {
-                if (responseString!=null && !responseString.equals("Duplicate") && !responseString.equals("Error")) {
-                    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("{brmsControllerDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        } catch (Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setCharacterEncoding("UTF-8");
-            request.setCharacterEncoding("UTF-8");
-            PrintWriter out = response.getWriter();
-            out.write(e.getMessage());
-        }
-        return null;
-    }
- 
-    @RequestMapping(value={"/brms_dictionary/remove_brmsController"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-    public ModelAndView removeBRMSControllerDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        try{
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            JsonNode root = mapper.readTree(request.getReader());
-            BRMSController brmsController = (BRMSController)mapper.readValue(root.get("data").toString(), BRMSController.class);
-            commonClassDao.delete(brmsController);
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application / json");
-            request.setCharacterEncoding("UTF-8");
-            PrintWriter out = response.getWriter();
-            String responseString = mapper.writeValueAsString(commonClassDao.getData(BRMSController.class));
-            JSONObject j = new JSONObject("{brmsControllerDictionaryDatas: " + responseString + "}");
-            out.write(j.toString());
-            return null;
-        }
-        catch (Exception e){
-            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setCharacterEncoding("UTF-8");
-            request.setCharacterEncoding("UTF-8");
-            PrintWriter out = response.getWriter();
-            out.write(e.getMessage());
-        }
-        return null;
-    }
-    
-    public BRMSDependency getDependencyDataByID(String dependencyName){
-        return (BRMSDependency) commonClassDao.getEntityItem(BRMSDependency.class, "dependencyName", dependencyName);
-    }
-    
-    public BRMSController getControllerDataByID(String controllerName){
-        return (BRMSController) commonClassDao.getEntityItem(BRMSController.class, "controllerName", controllerName);
-    }
-	
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
deleted file mode 100644
index f97d84692..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-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.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.adapters.GridData;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ClosedLoopD2Services;
-import org.openecomp.policy.rest.jpa.ClosedLoopSite;
-import org.openecomp.policy.rest.jpa.PEPOptions;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.jpa.VNFType;
-import org.openecomp.policy.rest.jpa.VSCLAction;
-import org.openecomp.policy.rest.jpa.VarbindDictionary;
-import org.openecomp.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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class ClosedLoopDictionaryController{
-
-	private static final Logger LOGGER = FlexLogger.getLogger(ClosedLoopDictionaryController.class);
-
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public ClosedLoopDictionaryController(CommonClassDao commonClassDao){
-		ClosedLoopDictionaryController.commonClassDao = commonClassDao;
-	}
-	
-	public ClosedLoopDictionaryController(){}
-
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;
-	}
-
-
-	@RequestMapping(value={"/get_VSCLActionDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getVSCLActionDictionaryByNameEntityData(HttpServletRequest request, 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);
-		}
-	}
-
-
-	@RequestMapping(value={"/get_VSCLActionData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getVSCLActionDictionaryEntityData(HttpServletRequest request, 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", "success"); 
-			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("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/get_VNFTypeDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getVNFTypeDictionaryByNameEntityData(HttpServletRequest request, 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", "success"); 
-			response.addHeader("operation", "getDictionary");
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_VNFTypeData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getVNFTypeDictionaryEntityData(HttpServletRequest request, 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", "success"); 
-			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("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/get_PEPOptionsDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getPEPOptionsDictionaryByNameEntityData(HttpServletRequest request, 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);
-		}
-	}
-
-	@RequestMapping(value={"/get_PEPOptionsData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getPEPOptionsDictionaryEntityData(HttpServletRequest request, 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", "success"); 
-			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("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/get_VarbindDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getVarbindDictionaryByNameEntityData(HttpServletRequest request, 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);
-		}
-	}
-
-	@RequestMapping(value={"/get_VarbindDictionaryData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getVarbindDictionaryEntityData(HttpServletRequest request, 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", "success"); 
-			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("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/get_ClosedLoopServicesDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getClosedLoopServiceDictionaryByNameEntityData(HttpServletRequest request, 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);
-		}
-	}
-
-	@RequestMapping(value={"/get_ClosedLoopServicesData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getClosedLoopServiceDictionaryEntityData(HttpServletRequest request, 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", "success"); 
-			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("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/get_ClosedLoopSiteDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getClosedLoopSiteDictionaryByNameEntityData(HttpServletRequest request, 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);
-		}
-	}
-
-	@RequestMapping(value={"/get_ClosedLoopSiteData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getClosedLoopSiteDictionaryEntityData(HttpServletRequest request, 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", "success"); 
-			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("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/cl_dictionary/save_vsclAction"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveVSCLAction(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			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);
-				userId = "API";
-
-				//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(vSCLAction.getVsclaction(), "vsclaction", VSCLAction.class);
-					int id = 0;
-					VSCLAction data = (VSCLAction) duplicateData.get(0);
-					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);
-				userId = root.get("userid").textValue();
-			}
-			if(vSCLAction.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(vSCLAction.getVsclaction(), "vsclaction", VSCLAction.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}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); 
-				}
-			}
-
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(VSCLAction.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("{vsclActionDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/remove_VsclAction"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeVSCLAction(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		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("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			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("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/save_vnfType"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveVnfType(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			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);
-				userId = "API";
-
-				//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(vNFType.getVnftype(), "vnftype", VNFType.class);
-					int id = 0;
-					VNFType data = (VNFType) duplicateData.get(0);
-					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);
-				userId = root.get("userid").textValue();
-			}
-			if(vNFType.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(vNFType.getVnftype(), "vnftype", VNFType.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					vNFType.setUserCreatedBy(this.getUserInfo(userId));
-					vNFType.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(vNFType);
-				}  	 
-			}else{
-				if(!isFakeUpdate) {
-					vNFType.setUserModifiedBy(this.getUserInfo(userId));
-					vNFType.setModifiedDate(new Date());
-					commonClassDao.update(vNFType); 
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(VNFType.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("{vnfTypeDictionaryDatas: " + responseString + "}");
-				out.write(j.toString()); 
-				return null;
-			}
-		} 
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/remove_vnfType"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeVnfType(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		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("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			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("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/save_pepOptions"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView savePEPOptions(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			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);
-                userId = "API";
-                
-                //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(pEPOptions.getPepName(), "pepName", PEPOptions.class);
-                    int id = 0;
-                    PEPOptions data = (PEPOptions) duplicateData.get(0);
-                    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);
-            	userId = root.get("userid").textValue();
-            }
-			String actions = "";
-			int counter = 0;
-			if(gridData.getAttributes().size() > 0){
-				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(actions);
-			if(pEPOptions.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(pEPOptions.getPepName(), "pepName", PEPOptions.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					pEPOptions.setUserCreatedBy(this.getUserInfo(userId));
-					pEPOptions.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(pEPOptions);
-				}   	 
-			}else{
-				if(!isFakeUpdate){
-					pEPOptions.setUserModifiedBy(this.getUserInfo(userId));
-					pEPOptions.setModifiedDate(new Date());
-					commonClassDao.update(pEPOptions);
-				}
-			}
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(PEPOptions.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("{pepOptionsDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
- 
-        }catch (Exception e){
-        	LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/remove_pepOptions"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePEPOptions(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		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("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			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("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/save_service"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveServiceType(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			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);
-                userId = "API";
-                
-                //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(serviceData.getServiceName(), "serviceName", ClosedLoopD2Services.class);
-                    int id = 0;
-                    ClosedLoopD2Services data = (ClosedLoopD2Services) duplicateData.get(0);
-                    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);
-            	userId = root.get("userid").textValue();
-            }
-			if(serviceData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(serviceData.getServiceName(), "serviceName", ClosedLoopD2Services.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					serviceData.setUserCreatedBy(this.getUserInfo(userId));
-					serviceData.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(serviceData);
-				}
-			}else{
-				if(!isFakeUpdate){
-					serviceData.setUserModifiedBy(this.getUserInfo(userId));
-					serviceData.setModifiedDate(new Date());
-					commonClassDao.update(serviceData); 
-				}
-			}
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(ClosedLoopD2Services.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("{closedLoopServiceDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        }catch (Exception e){
-        	LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/remove_Service"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeServiceType(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		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("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			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("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/save_siteName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveSiteType(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			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);
-                userId = "API";
-                //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(siteData.getSiteName(), "siteName", ClosedLoopSite.class);
-                    int id = 0;
-                    ClosedLoopSite data = (ClosedLoopSite) duplicateData.get(0);
-                    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);
-            	userId = root.get("userid").textValue();
-            }
-			if(siteData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(siteData.getSiteName(), "siteName", ClosedLoopSite.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					siteData.setUserCreatedBy(this.getUserInfo(userId));
-					siteData.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(siteData);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					siteData.setUserModifiedBy(this.getUserInfo(userId));
-					siteData.setModifiedDate(new Date());
-					commonClassDao.update(siteData);
-				}
-			}
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(ClosedLoopSite.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("{closedLoopSiteDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        }catch (Exception e){
-        	LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/remove_site"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeSiteType(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		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("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			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("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/save_varbind"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveVarbind(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			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);
-                userId = "API";
-                
-                //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(varbindDictionary.getVarbindName(), "varbindName", VarbindDictionary.class);
-                    int id = 0;
-                    VarbindDictionary data = (VarbindDictionary) duplicateData.get(0);
-                    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);
-            	userId = root.get("userid").textValue();
-            }
-			if(varbindDictionary.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(varbindDictionary.getVarbindName(), "varbindName", VarbindDictionary.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					varbindDictionary.setUserCreatedBy(this.getUserInfo(userId));
-					varbindDictionary.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(varbindDictionary);
-				}	  
-			}else{
-				if(!isFakeUpdate){
-					varbindDictionary.setUserModifiedBy(this.getUserInfo(userId));
-					varbindDictionary.setModifiedDate(new Date());
-					commonClassDao.update(varbindDictionary);
-				}
-			}
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(VarbindDictionary.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("{varbindDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        }catch (Exception e){
-        	LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/cl_dictionary/remove_varbindDict"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeVarbind(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		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("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			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("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-}
-
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java
deleted file mode 100644
index c9a20066d..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DecisionPolicyDictionaryController.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-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.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.DecisionSettings;
-import org.openecomp.policy.rest.jpa.RainyDayTreatments;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class DecisionPolicyDictionaryController {
-
-	private static final Logger LOGGER  = FlexLogger.getLogger(DecisionPolicyDictionaryController.class);
-	
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public DecisionPolicyDictionaryController(CommonClassDao commonClassDao){
-		DecisionPolicyDictionaryController.commonClassDao = commonClassDao;
-	}
-	
-	public DecisionPolicyDictionaryController(){}
-	
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;	
-	}
-	
-	@RequestMapping(value={"/get_SettingsDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getSettingsDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("settingsDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(DecisionSettings.class, "xacmlId")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	
-	@RequestMapping(value={"/get_SettingsDictionaryData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getSettingsDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("settingsDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(DecisionSettings.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-            response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-	
-	@RequestMapping(value={"/decision_dictionary/save_Settings"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			DecisionSettings decisionSettings;
-            String userId = null;
-            
-            if (fromAPI) {
-            	decisionSettings = (DecisionSettings)mapper.readValue(root.get("dictionaryFields").toString(), DecisionSettings.class);
-            	userId = "API";
-
-            	//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(decisionSettings.getXacmlId(), "xacmlId", DecisionSettings.class);
-            		int id = 0;
-            		DecisionSettings data = (DecisionSettings) duplicateData.get(0);
-            		id = data.getId();
-            		if(id==0){
-            			isFakeUpdate=true;
-            			decisionSettings.setId(1);
-            		} else {
-            			decisionSettings.setId(id);
-            		}
-            		decisionSettings.setUserCreatedBy(this.getUserInfo(userId));
-            	}
-            } else {
-            	decisionSettings = (DecisionSettings)mapper.readValue(root.get("settingsDictionaryData").toString(), DecisionSettings.class);
-            	userId = root.get("userid").textValue();
-            }
-			if(decisionSettings.getDatatypeBean().getShortName() != null){
-				String datatype = decisionSettings.getDatatypeBean().getShortName();
-				Datatype a = new Datatype();
-				if(datatype.equalsIgnoreCase("string")){
-					a.setId(26);	
-				}else if(datatype.equalsIgnoreCase("integer")){
-					a.setId(12);	
-				}else if(datatype.equalsIgnoreCase("boolean")){
-					a.setId(18);	
-				}else if(datatype.equalsIgnoreCase("double")){
-					a.setId(25);	
-				}else if(datatype.equalsIgnoreCase("user")){
-					a.setId(29);	
-				}
-				decisionSettings.setDatatypeBean(a);
-			}
-			if(decisionSettings.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(decisionSettings.getXacmlId(), "xacmlId", DecisionSettings.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					decisionSettings.setUserCreatedBy(this.getUserInfo(userId));
-					decisionSettings.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(decisionSettings);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					decisionSettings.setUserModifiedBy(this.getUserInfo(userId));
-					decisionSettings.setModifiedDate(new Date());
-					commonClassDao.update(decisionSettings); 
-				}
-			}
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString =  mapper.writeValueAsString(commonClassDao.getData(DecisionSettings.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("{settingsDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
- 
-        }catch (Exception e){
-        	LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/settings_dictionary/remove_settings"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			DecisionSettings decisionSettings = (DecisionSettings)mapper.readValue(root.get("data").toString(), DecisionSettings.class);
-			commonClassDao.delete(decisionSettings);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(DecisionSettings.class));
-			JSONObject j = new JSONObject("{settingsDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-	
-	
-	
-	@RequestMapping(value={"/get_RainyDayDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getRainyDayDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("rainyDayDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(RainyDayTreatments.class, "bbid")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	
-	@RequestMapping(value={"/get_RainyDayDictionaryData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getRainyDayDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("rainyDayDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(RainyDayTreatments.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-            response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-	
-	@RequestMapping(value={"/decision_dictionary/save_RainyDay"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveRainyDayDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			RainyDayTreatments decisionRainyDay;
-            TreatmentValues treatmentsData = null;
-            if (fromAPI) {
-            	decisionRainyDay = (RainyDayTreatments)mapper.readValue(root.get("dictionaryFields").toString(), RainyDayTreatments.class);
-            	treatmentsData = (TreatmentValues)mapper.readValue(root.get("dictionaryFields").toString(), TreatmentValues.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(decisionRainyDay.getBbid()+":"+decisionRainyDay.getWorkstep(), "bbid:workstep", RainyDayTreatments.class);
-            		int id = 0;
-            		RainyDayTreatments data = (RainyDayTreatments) duplicateData.get(0);
-            		id = data.getId();
-            		if(id==0){
-            			isFakeUpdate=true;
-            		} else {
-            			decisionRainyDay.setId(id);
-            		}
-            	}
-            } else {
-            	decisionRainyDay = (RainyDayTreatments)mapper.readValue(root.get("rainyDayDictionaryData").toString(), RainyDayTreatments.class);
-            	treatmentsData = (TreatmentValues)mapper.readValue(root.get("rainyDayDictionaryData").toString(), TreatmentValues.class);
-            }
-            
-			String userValue = "";
-			int counter = 0;
-			if(treatmentsData.getUserDataTypeValues().size() > 0){
-				for(Object treatment : treatmentsData.getUserDataTypeValues()){
-					if(treatment instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) treatment).get("treatment").toString();
-						if(counter>0){
-							userValue = userValue + ",";
-						}
-						userValue = userValue + key ;
-						counter ++;
-					}
-				}
-			}
-			decisionRainyDay.setTreatments(userValue);
-			
-			if(decisionRainyDay.getId() == 0){
-        		List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(decisionRainyDay.getBbid()+":"+decisionRainyDay.getWorkstep(), "bbid:workstep", RainyDayTreatments.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(decisionRainyDay);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(decisionRainyDay); 
-				}
-			}
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString =  mapper.writeValueAsString(commonClassDao.getData(RainyDayTreatments.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("{rainyDayDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
- 
-        }catch (Exception e){
-        	LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/decision_dictionary/remove_rainyDay"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeRainyDayDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			RainyDayTreatments decisionRainyDay = (RainyDayTreatments)mapper.readValue(root.get("data").toString(), RainyDayTreatments.class);
-			commonClassDao.delete(decisionRainyDay);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(RainyDayTreatments.class));
-			JSONObject j = new JSONObject("{rainyDayDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-	
-}
-
-class TreatmentValues { 
-	private ArrayList<Object> userDataTypeValues;
-
-	public ArrayList<Object> getUserDataTypeValues() {
-		return userDataTypeValues;
-	}
-
-	public void setUserDataTypeValues(ArrayList<Object> userDataTypeValues) {
-		this.userDataTypeValues = userDataTypeValues;
-	}
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java
deleted file mode 100644
index 0ea1da171..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DescriptiveDictionaryController.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-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.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.adapters.GridData;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.DescriptiveScope;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class DescriptiveDictionaryController {
-
-	private static final Logger LOGGER  = FlexLogger.getLogger(DescriptiveDictionaryController.class);
-	
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public DescriptiveDictionaryController(CommonClassDao commonClassDao){
-		DescriptiveDictionaryController.commonClassDao = commonClassDao;
-	}
-	
-	public DescriptiveDictionaryController(){}
-	
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;	
-	}
-
-	@RequestMapping(value={"/get_DescriptiveScopeByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getDescriptiveDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("descriptiveScopeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(DescriptiveScope.class, "descriptiveScopeName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-	
-	@RequestMapping(value={"/get_DescriptiveScope"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getDescriptiveDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("descriptiveScopeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(DescriptiveScope.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-            response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-	
-	@RequestMapping(value={"/descriptive_dictionary/save_descriptive"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-            DescriptiveScope descriptiveScope;
-            GridData data;
-            String userId = null;
-            if (fromAPI) {
-                descriptiveScope = (DescriptiveScope)mapper.readValue(root.get("dictionaryFields").toString(), DescriptiveScope.class);
-                data = (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 (request.getParameter("operation").equals("update")) {
-                	List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(descriptiveScope.getScopeName(), "descriptiveScopeName", DescriptiveScope.class);
-                	int id = 0;
-                	DescriptiveScope dbdata = (DescriptiveScope) duplicateData.get(0);
-                	id = dbdata.getId();
-                	if(id==0){
-                		isFakeUpdate=true;
-                		descriptiveScope.setId(1);
-                	} else {
-                		descriptiveScope.setId(id);
-                	}
-                	descriptiveScope.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-            	descriptiveScope = (DescriptiveScope)mapper.readValue(root.get("descriptiveScopeDictionaryData").toString(), DescriptiveScope.class);
-            	data = (GridData)mapper.readValue(root.get("descriptiveScopeDictionaryData").toString(), GridData.class);
-            	userId = root.get("userid").textValue();
-            }
-			String header = "";
-			int counter = 0;
-			if(data.getAttributes().size() > 0){
-				for(Object attribute : data.getAttributes()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						String value = ((LinkedHashMap<?, ?>) attribute).get("number").toString();
-						if(counter>0){
-							header = header + "AND";
-						}
-						header = header + key + ":";
-						header = header + value;
-						counter ++;
-					}
-				}
-			}
-			descriptiveScope.setSearch(header);
-			if(descriptiveScope.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(descriptiveScope.getScopeName(), "descriptiveScopeName", DescriptiveScope.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					descriptiveScope.setUserCreatedBy(this.getUserInfo(userId));
-					descriptiveScope.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(descriptiveScope);
-				}
-			}else{
-				if(!isFakeUpdate){
-					descriptiveScope.setUserModifiedBy(this.getUserInfo(userId));
-					descriptiveScope.setModifiedDate(new Date());
-					commonClassDao.update(descriptiveScope); 
-				}
-			} 
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString =  mapper.writeValueAsString(commonClassDao.getData(DescriptiveScope.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("{descriptiveScopeDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
- 
-        }catch (Exception e){
-        	LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/descriptive_dictionary/remove_descriptiveScope"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			DescriptiveScope descriptiveScope = (DescriptiveScope)mapper.readValue(root.get("data").toString(), DescriptiveScope.class);
-			commonClassDao.delete(descriptiveScope);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(DescriptiveScope.class));
-			JSONObject j = new JSONObject("{descriptiveScopeDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-}
-
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java
deleted file mode 100644
index b01f9b031..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryController.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.Attribute;
-import org.openecomp.policy.rest.jpa.Category;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.EcompName;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.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;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class DictionaryController {
-	
-	private static final Log LOGGER	= LogFactory.getLog(DictionaryController.class);
-
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public DictionaryController(CommonClassDao commonClassDao){
-		DictionaryController.commonClassDao = commonClassDao;
-	}
-	
-	public DictionaryController(){}
-	
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;	
-	}
-	
-	
-	public Category getCategory(){
-		List<Object> list = commonClassDao.getData(Category.class);
-		for (int i = 0; i < list.size() ; i++) {
-			Category value = (Category) list.get(i);
-			if (value.getShortName().equals("resource")) {
-				return value;
-			}
-		}
-		return null;	
-	}
-
-	@RequestMapping(value={"/get_AttributeDatabyAttributeName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getAttributeDictionaryEntityDatabyAttributeName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			System.out.println();
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("attributeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(Attribute.class, "xacmlId")));
-			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);
-		}
-	}
-	
-	//Attribute Dictionary
-	@RequestMapping(value="/get_AttributeData", method= RequestMethod.GET , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getAttributeDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			System.out.println();
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("attributeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(Attribute.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-            response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-	
-	@RequestMapping(value={"/attribute_dictionary/save_attribute"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-            Attribute attributeData = null;
-            AttributeValues attributeValueData = null;
-            String userId = null;
-            if (fromAPI) {
-                //JsonNode json = root.get("dictionaryFields");
-                attributeData = (Attribute)mapper.readValue(root.get("dictionaryFields").toString(), Attribute.class);
-                attributeValueData = (AttributeValues)mapper.readValue(root.get("dictionaryFields").toString(), AttributeValues.class);
-                userId = "API";
-                
-                //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(attributeData.getXacmlId(), "xacmlId", Attribute.class);
-                	int id = 0;
-                	Attribute data = (Attribute) duplicateData.get(0);
-                	id = data.getId();
-                	if(id==0){
-                		isFakeUpdate=true;
-                		attributeData.setId(1);
-                	} else {
-                		attributeData.setId(id);
-                	}
-                	attributeData.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-            	attributeData = (Attribute)mapper.readValue(root.get("attributeDictionaryData").toString(), Attribute.class);
-            	attributeValueData = (AttributeValues)mapper.readValue(root.get("attributeDictionaryData").toString(), AttributeValues.class);
-            	userId = root.get("userid").textValue();
-            }
-			String userValue = "";
-			int counter = 0;
-			if(attributeValueData.getUserDataTypeValues().size() > 0){
-				for(Object attribute : attributeValueData.getUserDataTypeValues()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("attributeValues").toString();
-						if(counter>0){
-							userValue = userValue + ",";
-						}
-						userValue = userValue + key ;
-						counter ++;
-					}
-				}
-			}
-			attributeData.setAttributeValue(userValue);
-			if(attributeData.getDatatypeBean().getShortName() != null){
-				String datatype = attributeData.getDatatypeBean().getShortName();
-				Datatype a = new Datatype();
-				if(datatype.equalsIgnoreCase("string")){
-					a.setId(26);	
-				}else if(datatype.equalsIgnoreCase("integer")){
-					a.setId(12);	
-				}else if(datatype.equalsIgnoreCase("boolean")){
-					a.setId(18);	
-				}else if(datatype.equalsIgnoreCase("double")){
-					a.setId(25);	
-				}else if(datatype.equalsIgnoreCase("user")){
-					a.setId(29);	
-				}
-				attributeData.setDatatypeBean(a);
-			}
-			if(attributeData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(attributeData.getXacmlId(), "xacmlId", Attribute.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					attributeData.setCategoryBean(this.getCategory());
-					attributeData.setUserCreatedBy(this.getUserInfo(userId));
-					attributeData.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(attributeData);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					attributeData.setUserModifiedBy(this.getUserInfo(userId));
-					attributeData.setModifiedDate(new Date());
-					commonClassDao.update(attributeData); 
-				}
-			} 
-            String responseString = null;
-            if(duplicateflag) {
-                responseString = "Duplicate";
-            } else {
-                responseString = mapper.writeValueAsString(commonClassDao.getData(Attribute.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("{attributeDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        }catch (Exception e){
-        	LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/attribute_dictionary/remove_attribute"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			Attribute attributeData = (Attribute)mapper.readValue(root.get("data").toString(), Attribute.class);
-			commonClassDao.delete(attributeData);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(Attribute.class));
-			JSONObject j = new JSONObject("{attributeDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-	
-	//EcompName Dictionary
-	@RequestMapping(value={"/get_EcompNameDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getEcompNameDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-		LOGGER.info("get_EcompNameDataByName is called");
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("ecompNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(EcompName.class, "ecompName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-	
-	@RequestMapping(value={"/get_EcompNameData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getEcompNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("ecompNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(EcompName.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-            response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/ecomp_dictionary/save_ecompName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveEcompDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			EcompName ecompData;
-			String userId = null;
-			if (fromAPI) {
-				ecompData = (EcompName)mapper.readValue(root.get("dictionaryFields").toString(), EcompName.class);
-				userId = "API";
-
-				//check if update operation or create, get id for data to be updated
-				if (request.getParameter("operation").equals("update")) {
-					List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getEcompName(), "ecompName", EcompName.class);
-					int id = 0;
-					EcompName data = (EcompName) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						ecompData.setId(1);
-					} else {
-						ecompData.setId(id);
-					}
-					ecompData.setUserCreatedBy(this.getUserInfo(userId));
-				}
-			} else {
-				ecompData = (EcompName)mapper.readValue(root.get("ecompNameDictionaryData").toString(), EcompName.class);
-				userId = root.get("userid").textValue();
-			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getEcompName(), "ecompName", EcompName.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					ecompData.setUserCreatedBy(getUserInfo(userId));
-					ecompData.setUserModifiedBy(getUserInfo(userId));
-					commonClassDao.save(ecompData);
-				}
-			}else{
-				if(!isFakeUpdate){
-					ecompData.setUserModifiedBy(this.getUserInfo(userId));
-					ecompData.setModifiedDate(new Date());
-					commonClassDao.update(ecompData);
-				}
-			} 
-			String responseString = null;
-			if(duplicateflag) {
-				responseString = "Duplicate";
-			} else {
-				responseString = mapper.writeValueAsString(commonClassDao.getData(EcompName.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("{ecompNameDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/ecomp_dictionary/remove_ecomp"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeEcompDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			EcompName ecompData = (EcompName)mapper.readValue(root.get("data").toString(), EcompName.class);
-			commonClassDao.delete(ecompData);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(EcompName.class));
-			JSONObject j = new JSONObject("{ecompNameDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-}
-
-class AttributeValues{
-	private ArrayList<Object> userDataTypeValues;
-
-	public ArrayList<Object> getUserDataTypeValues() {
-		return userDataTypeValues;
-	}
-
-	public void setUserDataTypeValues(ArrayList<Object> userDataTypeValues) {
-		this.userDataTypeValues = userDataTypeValues;
-	}
-}
-
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryImportController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryImportController.java
deleted file mode 100644
index 94f83674b..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryImportController.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
- /*
-  * 
-  * 
-  * */
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.OutputStream;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.compress.utils.IOUtils;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionList;
-import org.openecomp.policy.rest.jpa.ActionPolicyDict;
-import org.openecomp.policy.rest.jpa.AddressGroup;
-import org.openecomp.policy.rest.jpa.Attribute;
-import org.openecomp.policy.rest.jpa.BRMSParamTemplate;
-import org.openecomp.policy.rest.jpa.Category;
-import org.openecomp.policy.rest.jpa.Datatype;
-import org.openecomp.policy.rest.jpa.DecisionSettings;
-import org.openecomp.policy.rest.jpa.DescriptiveScope;
-import org.openecomp.policy.rest.jpa.EcompName;
-import org.openecomp.policy.rest.jpa.GroupServiceList;
-import org.openecomp.policy.rest.jpa.PEPOptions;
-import org.openecomp.policy.rest.jpa.PrefixList;
-import org.openecomp.policy.rest.jpa.ProtocolList;
-import org.openecomp.policy.rest.jpa.SecurityZone;
-import org.openecomp.policy.rest.jpa.ServiceList;
-import org.openecomp.policy.rest.jpa.TermList;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.jpa.VNFType;
-import org.openecomp.policy.rest.jpa.VSCLAction;
-import org.openecomp.policy.rest.jpa.VarbindDictionary;
-import org.openecomp.policy.rest.jpa.Zone;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import au.com.bytecode.opencsv.CSVReader;
-
-
-@Controller
-public class DictionaryImportController {
-	private String newFile;
-
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public DictionaryImportController(CommonClassDao commonClassDao){
-		DictionaryImportController.commonClassDao = commonClassDao;
-	}
-	
-	public DictionaryImportController(){}	
-
-
-	@RequestMapping(value={"/dictionary/import_dictionary"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public void ImportDictionaryData(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		ObjectMapper mapper = new ObjectMapper();
-		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-		//JsonNode root = mapper.readTree(request.getReader());
-		String userId = request.getParameter("userId");
-		String dictionaryName = request.getParameter("dictionaryName");
-
-		File file = new File(dictionaryName);
-		OutputStream outputStream = new FileOutputStream(file);
-		IOUtils.copy(request.getInputStream(), outputStream);
-		outputStream.close();
-		this.newFile = file.toString();
-		CSVReader csvReader = new CSVReader(new FileReader(this.newFile));
-		List<String[]> dictSheet = csvReader.readAll();
-		if(dictionaryName.startsWith("Attribute")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				Attribute attribute = new Attribute("");
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("xacml_id") || dictSheet.get(0)[j].equalsIgnoreCase("Attribute ID")){
-						attribute.setXacmlId(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("priority")){
-						attribute.setPriority(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("datatype") || dictSheet.get(0)[j].equalsIgnoreCase("Data Type")){
-						Datatype dataType = new Datatype();
-						if(rows[j].equalsIgnoreCase("string")){
-							dataType.setId(26);
-						}else if(rows[j].equalsIgnoreCase("integer")){
-							dataType.setId(12);
-						}else if(rows[j].equalsIgnoreCase("double")){
-							dataType.setId(25);
-						}else if(rows[j].equalsIgnoreCase("boolean")){
-							dataType.setId(18);
-						}else if(rows[j].equalsIgnoreCase("user")){
-							dataType.setId(29);
-						}
-						attribute.setDatatypeBean(dataType);
-						Category category = new Category();
-						category.setId(5);
-						attribute.setCategoryBean(category);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("attribute_value") || dictSheet.get(0)[j].equalsIgnoreCase("Attribute Value")){
-						attribute.setAttributeValue(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("ActionPolicyDictionary")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				ActionPolicyDict attribute = new ActionPolicyDict("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("attribute_name") || dictSheet.get(0)[j].equalsIgnoreCase("Attribute Name")){
-						attribute.setAttributeName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("body")){
-						attribute.setBody(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("headers")){
-						attribute.setHeader(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("method")){
-						attribute.setMethod(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("type")){
-						attribute.setMethod(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("url")){
-						attribute.setMethod(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("EcompName")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				EcompName attribute = new EcompName("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("ecomp_name") || dictSheet.get(0)[j].equalsIgnoreCase("Ecomp Name")){
-						attribute.setEcompName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("VNFType")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				VNFType attribute = new VNFType("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("vnf_type") || dictSheet.get(0)[j].equalsIgnoreCase("VNF Type")){
-						attribute.setVnftype(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("VSCLAction")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				VSCLAction attribute = new VSCLAction("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("vscl_action") || dictSheet.get(0)[j].equalsIgnoreCase("VSCL Action")){
-						attribute.setVsclaction(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("PEPOptions")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				PEPOptions attribute = new PEPOptions("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("PEP_NAME") || dictSheet.get(0)[j].equalsIgnoreCase("PEP Name")){
-						attribute.setPepName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("Actions")){
-						attribute.setActions(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("VarbindDictionary")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				VarbindDictionary attribute = new VarbindDictionary("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("varbind_Name") || dictSheet.get(0)[j].equalsIgnoreCase("Varbind Name")){
-						attribute.setVarbindName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("varbind_Description") || dictSheet.get(0)[j].equalsIgnoreCase("Varbind Description")){
-						attribute.setVarbindDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("varbind_oid") || dictSheet.get(0)[j].equalsIgnoreCase("Varbind OID")){
-						attribute.setVarbindOID(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("BRMSParamDictionary")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				BRMSParamTemplate attribute = new BRMSParamTemplate();
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("param_template_name") || dictSheet.get(0)[j].equalsIgnoreCase("Rule Name")){
-						attribute.setRuleName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("DESCRIPTION") || dictSheet.get(0)[j].equalsIgnoreCase("Description")){
-						attribute.setDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("rule")){
-						attribute.setRule(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("Settings")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				DecisionSettings attribute = new DecisionSettings("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("xacml_id") || dictSheet.get(0)[j].equalsIgnoreCase("Settings ID")){
-						attribute.setXacmlId(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("priority")){
-						attribute.setPriority(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("datatype") || dictSheet.get(0)[j].equalsIgnoreCase("Data Type")){
-						Datatype dataType = new Datatype();
-						if(rows[j].equalsIgnoreCase("string")){
-							dataType.setId(26);
-						}else if(rows[j].equalsIgnoreCase("integer")){
-							dataType.setId(12);
-						}else if(rows[j].equalsIgnoreCase("double")){
-							dataType.setId(25);
-						}else if(rows[j].equalsIgnoreCase("boolean")){
-							dataType.setId(18);
-						}else if(rows[j].equalsIgnoreCase("user")){
-							dataType.setId(29);
-						}
-						attribute.setDatatypeBean(dataType);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("PrefixList")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				PrefixList attribute = new PrefixList("",  userId);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("prefixListName") || dictSheet.get(0)[j].equalsIgnoreCase("PrefixList Name")){
-						attribute.setPrefixListName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setPrefixListValue(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("prefixListValue") || dictSheet.get(0)[j].equalsIgnoreCase("PrefixList Value")){
-						attribute.setDescription(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("SecurityZone")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				SecurityZone attribute = new SecurityZone("",  userId);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("zoneName") || dictSheet.get(0)[j].equalsIgnoreCase("Zone Name")){
-						attribute.setZoneName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("zoneValue")  || dictSheet.get(0)[j].equalsIgnoreCase("Zone Value")){
-						attribute.setZoneValue(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("Zone")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				Zone attribute = new Zone("",  userId);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("zoneName") || dictSheet.get(0)[j].equalsIgnoreCase("Zone Name")){
-						attribute.setZoneName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("zoneValue")  || dictSheet.get(0)[j].equalsIgnoreCase("Zone Value")){
-						attribute.setZoneValue(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("ServiceList")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				ServiceList attribute = new ServiceList("",  userId);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("serviceName") || dictSheet.get(0)[j].equalsIgnoreCase("Service Name")){
-						attribute.setServiceName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("serviceDesc")  || dictSheet.get(0)[j].equalsIgnoreCase("Description")){
-						attribute.setServiceDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("serviceType")  || dictSheet.get(0)[j].equalsIgnoreCase("Service Type")){
-						attribute.setServiceType(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("serviceTrasProtocol")  || dictSheet.get(0)[j].equalsIgnoreCase("Transport Protocol")){
-						attribute.setServiceTransProtocol(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("serviceAppProtocol")  || dictSheet.get(0)[j].equalsIgnoreCase("APP Protocol")){
-						attribute.setServiceAppProtocol(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("servicePorts")  || dictSheet.get(0)[j].equalsIgnoreCase("Ports")){
-						attribute.setServicePorts(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("ServiceGroup")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				GroupServiceList attribute = new GroupServiceList("",  userId);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("name") || dictSheet.get(0)[j].equalsIgnoreCase("Group Name")){
-						attribute.setGroupName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("serviceList")  || dictSheet.get(0)[j].equalsIgnoreCase("Service List")){
-						attribute.setServiceList(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("AddressGroup")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				AddressGroup attribute = new AddressGroup("",  userId);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("name") || dictSheet.get(0)[j].equalsIgnoreCase("Group Name")){
-						attribute.setGroupName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("serviceList")  || dictSheet.get(0)[j].equalsIgnoreCase("Prefix List")){
-						attribute.setServiceList(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("ProtocolList")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				ProtocolList attribute = new ProtocolList("",  userId);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("protocolName") || dictSheet.get(0)[j].equalsIgnoreCase("Protocol Name")){
-						attribute.setProtocolName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("ActionList")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				ActionList attribute = new ActionList("",  userId);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("actionName") || dictSheet.get(0)[j].equalsIgnoreCase("Action Name")){
-						attribute.setActionName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("TermList")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				TermList attribute = new TermList("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("termName") || dictSheet.get(0)[j].equalsIgnoreCase("Term-Name")){
-						attribute.setTermName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("Term-Description") || dictSheet.get(0)[j].equalsIgnoreCase("termDescription")){
-						attribute.setDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("fromZone")  || dictSheet.get(0)[j].equalsIgnoreCase("From Zone")){
-						attribute.setFromZones(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("toZone") || dictSheet.get(0)[j].equalsIgnoreCase("To Zone")){
-						attribute.setToZones(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("srcIPList") || dictSheet.get(0)[j].equalsIgnoreCase("Source-IP-List")){
-						attribute.setSrcIPList(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("destIPList") || dictSheet.get(0)[j].equalsIgnoreCase("Destination-IP-List")){
-						attribute.setDestIPList(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("srcPortList") || dictSheet.get(0)[j].equalsIgnoreCase("Source-Port-List")){
-						attribute.setSrcPortList(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("destPortList") || dictSheet.get(0)[j].equalsIgnoreCase("Destination-Port-List")){
-						attribute.setDestPortList(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("action") || dictSheet.get(0)[j].equalsIgnoreCase("Action List")){
-						attribute.setAction(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		if(dictionaryName.startsWith("SearchCriteria")){
-			for(int i = 1; i< dictSheet.size(); i++){
-				DescriptiveScope attribute = new DescriptiveScope("",  userId);
-				UserInfo userinfo = new UserInfo();
-				userinfo.setUserLoginId(userId);
-				attribute.setUserCreatedBy(userinfo);
-				attribute.setUserModifiedBy(userinfo);
-				String[] rows = dictSheet.get(i);
-				for (int j=0 ; j<rows.length; j++ ){
-					if(dictSheet.get(0)[j].equalsIgnoreCase("descriptiveScopeName") || dictSheet.get(0)[j].equalsIgnoreCase("Descriptive ScopeName")){
-						attribute.setScopeName(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("description")){
-						attribute.setDescription(rows[j]);
-					}
-					if(dictSheet.get(0)[j].equalsIgnoreCase("search") || dictSheet.get(0)[j].equalsIgnoreCase("Search Criteria")){
-						attribute.setSearch(rows[j]);
-					}
-				}
-				commonClassDao.save(attribute);
-			}
-		}
-		csvReader.close();
-		if(file.exists()){
-			file.delete();
-		}
-	}
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/EnforcerDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/EnforcerDictionaryController.java
deleted file mode 100644
index bfccb984a..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/EnforcerDictionaryController.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-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.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.EnforcingType;
-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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class EnforcerDictionaryController {
-
-	private static final Logger LOGGER	= FlexLogger.getLogger(EnforcerDictionaryController.class);
-	
-	@Autowired
-	CommonClassDao commonClassDao;
-
-	@RequestMapping(value={"/get_EnforcerTypeData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getEnforcerDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			List<Object> list = commonClassDao.getData(EnforcingType.class);
-			List<String> dictList = new ArrayList<>();
-			for(int i = 0; i < list.size(); i++){
-				EnforcingType dict = (EnforcingType) list.get(i);
-				dictList.add(dict.getEnforcingType());
-			}
-			model.put("enforcerDictionaryDatas", mapper.writeValueAsString(dictList));
-			org.openecomp.policy.pap.xacml.rest.util.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={"/enforcer_dictionary/save_enforcerType"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			EnforcingType enforcingType = (EnforcingType)mapper.readValue(root.get("enforcerDictionaryData").toString(), EnforcingType.class);
-			if(enforcingType.getId() == 0){
-				commonClassDao.save(enforcingType);
-			}else{
-				commonClassDao.update(enforcingType); 
-			} 
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(EnforcingType.class));
-			JSONObject j = new JSONObject("{enforcerDictionaryDatas: " + responseString + "}");
-
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/enforcer_dictionary/remove_enforcer"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			EnforcingType enforcingType = (EnforcingType)mapper.readValue(root.get("data").toString(), EnforcingType.class);
-			commonClassDao.delete(enforcingType);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(EnforcingType.class));
-			JSONObject j = new JSONObject("{enforcerDictionaryDatas: " + 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;
-	}
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java
deleted file mode 100644
index 5172f451b..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/FirewallDictionaryController.java
+++ /dev/null
@@ -1,2279 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-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.jboss.netty.handler.ipfilter.CIDR;
-import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.adapters.GridData;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.ActionList;
-import org.openecomp.policy.rest.jpa.AddressGroup;
-import org.openecomp.policy.rest.jpa.FWTag;
-import org.openecomp.policy.rest.jpa.FWTagPicker;
-import org.openecomp.policy.rest.jpa.FirewallDictionaryList;
-import org.openecomp.policy.rest.jpa.GroupServiceList;
-import org.openecomp.policy.rest.jpa.PrefixList;
-import org.openecomp.policy.rest.jpa.PortList;
-import org.openecomp.policy.rest.jpa.ProtocolList;
-import org.openecomp.policy.rest.jpa.SecurityZone;
-import org.openecomp.policy.rest.jpa.ServiceList;
-import org.openecomp.policy.rest.jpa.TermList;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.jpa.Zone;
-import org.openecomp.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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-
-@Controller
-public class FirewallDictionaryController {
-
-	private static final Logger LOGGER  = FlexLogger.getLogger(FirewallDictionaryController.class);
-
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public FirewallDictionaryController(CommonClassDao commonClassDao){
-		FirewallDictionaryController.commonClassDao = commonClassDao;
-	}
-	
-	public FirewallDictionaryController(){}	
-
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;	
-	}
-
-
-	@RequestMapping(value={"/get_PrefixListDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getPrefixListDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("prefixListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(PrefixList.class, "prefixListName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_PrefixListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getPrefixListDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("prefixListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(PrefixList.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_prefixList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView savePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PrefixList prefixList;
-			if (fromAPI) {
-				prefixList = (PrefixList)mapper.readValue(root.get("dictionaryFields").toString(), PrefixList.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(prefixList.getPrefixListName(), "prefixListName", PrefixList.class);
-					int id = 0;
-					PrefixList data = (PrefixList) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						prefixList.setId(1);
-					} else {
-						prefixList.setId(id);
-					}
-				}
-			} else {
-				prefixList = (PrefixList)mapper.readValue(root.get("prefixListDictionaryData").toString(), PrefixList.class);
-			}
-			if(prefixList.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(prefixList.getPrefixListName(), "prefixListName", PrefixList.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(prefixList);
-				}		
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(prefixList); 
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(PrefixList.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("{prefixListDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_PrefixList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PrefixList prefixList = (PrefixList)mapper.readValue(root.get("data").toString(), PrefixList.class);
-			commonClassDao.delete(prefixList);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(PrefixList.class));
-			JSONObject j = new JSONObject("{prefixListDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/validate_prefixList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView validatePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PrefixList prefixList = (PrefixList)mapper.readValue(root.get("prefixListDictionaryData").toString(), PrefixList.class);
-			String responseValidation = "success";
-			try{
-				CIDR.newCIDR(prefixList.getPrefixListValue());
-			}catch(UnknownHostException e){
-				responseValidation = "error";
-			}		
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			JSONObject j = new JSONObject("{result: " + responseValidation + "}");
-			out.write(j.toString());
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/get_PortListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getPortListDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("portListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(PortList.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_portName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView savePortListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PortList portList = (PortList)mapper.readValue(root.get("portListDictionaryData").toString(), PortList.class);
-			if(portList.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(portList.getPortName(), "portName", PortList.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(portList);
-				}
-			}else{
-				commonClassDao.update(portList); 
-			} 
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(PortList.class));
-			}
-			JSONObject j = new JSONObject("{portListDictionaryDatas: " + responseString + "}");
-
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_PortList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePortListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PortList portList = (PortList)mapper.readValue(root.get("data").toString(), PortList.class);
-			commonClassDao.delete(portList);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(PortList.class));
-			JSONObject j = new JSONObject("{portListDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/get_ProtocolListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getProtocolListDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<String, Object>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("protocolListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(ProtocolList.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/get_ProtocolListDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getProtocolListDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<String, Object>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("protocolListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(ProtocolList.class, "protocolName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_protocolList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			ProtocolList protocolList;
-			if (fromAPI) {
-				protocolList = (ProtocolList)mapper.readValue(root.get("dictionaryFields").toString(), ProtocolList.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(protocolList.getProtocolName(), "protocolName", ProtocolList.class);
-					int id = 0;
-					ProtocolList data = (ProtocolList) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						protocolList.setId(1);
-					} else {
-						protocolList.setId(id);
-					}
-				}
-			} else {
-				protocolList = (ProtocolList)mapper.readValue(root.get("protocolListDictionaryData").toString(), ProtocolList.class);
-			}
-			if(protocolList.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(protocolList.getProtocolName(), "protocolName", ProtocolList.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(protocolList);
-				}
-			}else{
-				if(!isFakeUpdate){
-					commonClassDao.update(protocolList);
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(ProtocolList.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("{protocolListDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_protocol"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			ProtocolList protocolList = (ProtocolList)mapper.readValue(root.get("data").toString(), ProtocolList.class);
-			commonClassDao.delete(protocolList);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(ProtocolList.class));
-			JSONObject j = new JSONObject("{protocolListDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/get_AddressGroupDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getAddressGroupDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("addressGroupDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(AddressGroup.class, "name")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_AddressGroupData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getAddressGroupDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("addressGroupDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(AddressGroup.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_addressGroup"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			AddressGroup addressGroup;
-			GridData gridData;
-			if (fromAPI) {
-				addressGroup = (AddressGroup)mapper.readValue(root.get("dictionaryFields").toString(), AddressGroup.class);
-				gridData = (GridData)mapper.readValue(root.get("dictionaryFields").toString(), GridData.class);
-
-				if(!addressGroup.getGroupName().startsWith("Group_")){
-					String groupName = "Group_"+addressGroup.getGroupName();
-					addressGroup.setGroupName(groupName);
-				}
-
-				//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(addressGroup.getGroupName(), "name", AddressGroup.class);
-					int id = 0;
-					AddressGroup data = (AddressGroup) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						addressGroup.setId(1);
-					} else {
-						addressGroup.setId(id);
-					}            
-				}
-			} else {
-				addressGroup = (AddressGroup)mapper.readValue(root.get("addressGroupDictionaryData").toString(), AddressGroup.class);
-				gridData = (GridData)mapper.readValue(root.get("addressGroupDictionaryData").toString(), GridData.class);
-				if(!addressGroup.getGroupName().startsWith("Group_")){
-					String groupName = "Group_"+addressGroup.getGroupName();
-					addressGroup.setGroupName(groupName);
-				}
-			}
-			String userValue = "";
-			int counter = 0;
-			if(gridData.getAttributes().size() > 0){
-				for(Object attribute : gridData.getAttributes()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						if(counter>0){
-							userValue = userValue + ",";
-						}
-						userValue = userValue + key ;
-						counter ++;
-					}
-				}
-			}
-			addressGroup.setServiceList(userValue);
-			if(addressGroup.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(addressGroup.getGroupName(), "name", AddressGroup.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(addressGroup);
-				}
-			}else{
-				if (!isFakeUpdate) {
-					commonClassDao.update(addressGroup); 
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(AddressGroup.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("{addressGroupDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_AddressGroup"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			AddressGroup addressGroup = (AddressGroup)mapper.readValue(root.get("data").toString(), AddressGroup.class);
-			commonClassDao.delete(addressGroup);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(AddressGroup.class));
-			JSONObject j = new JSONObject("{addressGroupDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/get_ActionListDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getActionListDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			List<Object> list = commonClassDao.getData(ActionList.class);
-			List<String> dictList = new ArrayList<>();
-			for(int i = 0; i < list.size(); i++){
-				ActionList dict = (ActionList) list.get(i);
-				dictList.add(dict.getActionName());
-			}
-			model.put("actionListDictionaryDatas", mapper.writeValueAsString(dictList));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_ActionListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getActionListDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("actionListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(ActionList.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_ActionList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			ActionList actionList;
-			if (fromAPI) {
-				actionList = (ActionList)mapper.readValue(root.get("dictionaryFields").toString(), ActionList.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(actionList.getActionName(), "actionName", ActionList.class);
-					int id = 0;
-					ActionList data = (ActionList) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						actionList.setId(1);
-					} else {
-						actionList.setId(id);
-					}  
-				}
-			} else {
-				actionList = (ActionList)mapper.readValue(root.get("actionListDictionaryData").toString(), ActionList.class);
-			}
-			if(actionList.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(actionList.getActionName(), "actionName", ActionList.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(actionList);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(actionList);
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(ActionList.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("{actionListDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_ActionList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			ActionList actionList = (ActionList)mapper.readValue(root.get("data").toString(), ActionList.class);
-			commonClassDao.delete(actionList);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(ActionList.class));
-			JSONObject j = new JSONObject("{actionListDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/get_ServiceGroupData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getServiceGroupDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("serviceGroupDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(GroupServiceList.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/get_ServiceGroupDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getServiceGroupDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("serviceGroupDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(GroupServiceList.class, "name")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_serviceGroup"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			GroupServiceList groupServiceList;
-			GridData gridData;
-			if (fromAPI) {
-				groupServiceList = (GroupServiceList)mapper.readValue(root.get("dictionaryFields").toString(), GroupServiceList.class);
-				gridData = (GridData)mapper.readValue(root.get("dictionaryFields").toString(), GridData.class);
-
-				if(!groupServiceList.getGroupName().startsWith("Group_")){
-					String groupName = "Group_"+groupServiceList.getGroupName();
-					groupServiceList.setGroupName(groupName);
-				}
-				//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(groupServiceList.getGroupName(), "name", GroupServiceList.class);
-					int id = 0;
-					GroupServiceList data = (GroupServiceList) duplicateData.get(0);
-					id = data.getId();
-
-					if(id==0){
-						isFakeUpdate=true;
-						groupServiceList.setId(1);
-					} else {
-						groupServiceList.setId(id);
-					}   
-				}
-			} else {
-				groupServiceList = (GroupServiceList)mapper.readValue(root.get("serviceGroupDictionaryData").toString(), GroupServiceList.class);
-				gridData = (GridData)mapper.readValue(root.get("serviceGroupDictionaryData").toString(), GridData.class);
-			}
-			if(!groupServiceList.getGroupName().startsWith("Group_")){
-				String groupName = "Group_"+groupServiceList.getGroupName();
-				groupServiceList.setGroupName(groupName);
-			}
-			String userValue = "";
-			int counter = 0;
-			if(gridData.getAttributes().size() > 0){
-				for(Object attribute : gridData.getAttributes()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						if(counter>0){
-							userValue = userValue + ",";
-						}
-						userValue = userValue + key ;
-						counter ++;
-					}
-				}
-			}
-			groupServiceList.setServiceList(userValue);
-			if(groupServiceList.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(groupServiceList.getGroupName(), "name", GroupServiceList.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(groupServiceList);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(groupServiceList); 
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(GroupServiceList.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("{serviceGroupDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_serviceGroup"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			GroupServiceList groupServiceList = (GroupServiceList)mapper.readValue(root.get("data").toString(), GroupServiceList.class);
-			commonClassDao.delete(groupServiceList);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(GroupServiceList.class));
-			JSONObject j = new JSONObject("{serviceGroupDictionaryDatas: " + 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={"/get_SecurityZoneDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getSecurityZoneDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("securityZoneDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(SecurityZone.class, "zoneName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_SecurityZoneData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getSecurityZoneDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("securityZoneDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(SecurityZone.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_securityZone"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			SecurityZone securityZone;
-			if (fromAPI) {
-				securityZone = (SecurityZone)mapper.readValue(root.get("dictionaryFields").toString(), SecurityZone.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(securityZone.getZoneName(), "zoneName", SecurityZone.class);
-					int id = 0;
-					SecurityZone data = (SecurityZone) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						securityZone.setId(1);
-					} else {
-						securityZone.setId(id);
-					}               
-				}
-			} else {
-				securityZone = (SecurityZone)mapper.readValue(root.get("securityZoneDictionaryData").toString(), SecurityZone.class);
-			}
-			if(securityZone.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(securityZone.getZoneName(), "zoneName", SecurityZone.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(securityZone);
-				}			
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(securityZone); 
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(SecurityZone.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("{securityZoneDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_securityZone"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			SecurityZone securityZone = (SecurityZone)mapper.readValue(root.get("data").toString(), SecurityZone.class);
-			commonClassDao.delete(securityZone);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(SecurityZone.class));
-			JSONObject j = new JSONObject("{securityZoneDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-
-	@RequestMapping(value={"/get_ServiceListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getServiceListDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("serviceListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(ServiceList.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/get_ServiceListDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getServiceListDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("serviceListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(ServiceList.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);
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_serviceList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			ServiceList serviceList;
-			GridData serviceListGridData;
-			if (fromAPI) {
-				serviceList = (ServiceList)mapper.readValue(root.get("dictionaryFields").toString(), ServiceList.class);
-				serviceListGridData = (GridData)mapper.readValue(root.get("dictionaryFields").toString(), GridData.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(serviceList.getServiceName(), "serviceName", ServiceList.class);
-					int id = 0;
-					ServiceList data = (ServiceList) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						serviceList.setId(1);
-					} else {
-						serviceList.setId(id);
-					}
-				}
-			}else{
-				serviceList = (ServiceList)mapper.readValue(root.get("serviceListDictionaryData").toString(), ServiceList.class);
-				serviceListGridData = (GridData)mapper.readValue(root.get("serviceListDictionaryData").toString(), GridData.class);
-			}
-			String tcpValue = "";
-			int counter = 0;
-			if(serviceListGridData.getTransportProtocols().size() > 0){
-				for(Object attribute : serviceListGridData.getTransportProtocols()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						if(counter>0){
-							tcpValue = tcpValue + ",";
-						}
-						tcpValue = tcpValue + key ;
-						counter ++;
-					}
-				}
-			}
-			serviceList.setServiceTransProtocol(tcpValue);
-			String appValue = "";
-			int counter1 = 0;
-			if(serviceListGridData.getAppProtocols().size() > 0){
-				for(Object attribute : serviceListGridData.getAppProtocols()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						if(counter1>0){
-							appValue = appValue + ",";
-						}
-						appValue = appValue + key ;
-						counter1 ++;
-					}
-				}
-			}
-			serviceList.setServiceAppProtocol(appValue);
-			serviceList.setServiceType("SERVICE");
-			if(serviceList.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(serviceList.getServiceName(), "serviceName", ServiceList.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(serviceList);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(serviceList); 
-				}
-			} 
-
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(ServiceList.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("{serviceListDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_serviceList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			ServiceList serviceList = (ServiceList)mapper.readValue(root.get("data").toString(), ServiceList.class);
-			commonClassDao.delete(serviceList);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(ServiceList.class));
-			JSONObject j = new JSONObject("{serviceListDictionaryDatas: " + 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={"/get_ZoneData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getZoneDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("zoneDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(Zone.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("Exception Occured"+e);
-		}
-	}
-
-	@RequestMapping(value={"/get_ZoneDictionaryDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getZoneDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("zoneDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(Zone.class, "zoneName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_zoneName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			Zone zone;
-			if (fromAPI) {
-				zone = (Zone)mapper.readValue(root.get("dictionaryFields").toString(), Zone.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(zone.getZoneName(), "zoneName", Zone.class);
-					int id = 0;
-					Zone data = (Zone) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						zone.setId(1);
-					} else {
-						zone.setId(id);
-					}
-				}
-			} else {
-				zone = (Zone)mapper.readValue(root.get("zoneDictionaryData").toString(), Zone.class);
-			}
-			if(zone.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(zone.getZoneName(), "zoneName", Zone.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(zone);
-				}	
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(zone); 
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(Zone.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("{zoneDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_zone"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			Zone zone = (Zone)mapper.readValue(root.get("data").toString(), Zone.class);
-			commonClassDao.delete(zone);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(Zone.class));
-			JSONObject j = new JSONObject("{zoneDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/get_TermListDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getTermListDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<String, Object>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("termListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(TermList.class, "termName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_TermListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getTermListDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<String, Object>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("termListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(TermList.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_termList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			TermList termList;
-			TermListData termListDatas;
-			String userId = null;
-			if (fromAPI) {
-				termList = (TermList)mapper.readValue(root.get("dictionaryFields").toString(), TermList.class);
-				termListDatas = (TermListData)mapper.readValue(root.get("dictionaryFields").toString(), TermListData.class);
-				userId = "API";
-
-				//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(termList.getTermName(), "termName", TermList.class);
-					int id = 0;
-					TermList data = (TermList) duplicateData.get(0);
-					id = data.getId();
-					if(id==0){
-						isFakeUpdate=true;
-						termList.setId(1);
-					} else {
-						termList.setId(id);
-					}                 
-					termList.setUserCreatedBy(this.getUserInfo(userId));
-				}
-			} else {
-				termList = (TermList)mapper.readValue(root.get("termListDictionaryData").toString(), TermList.class);
-				termListDatas = (TermListData)mapper.readValue(root.get("termListDictionaryData").toString(), TermListData.class);
-				userId = root.get("userid").textValue();
-			}
-			String fromZoneValue = "";
-			int counter = 0;
-			if(termListDatas.getFromZoneDatas().size() > 0){
-				for(Object fromZone : termListDatas.getFromZoneDatas()){
-					if(fromZone instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) fromZone).get("option").toString();
-						if(counter>0){
-							fromZoneValue = fromZoneValue + ",";
-						}
-						fromZoneValue = fromZoneValue + key ;
-						counter ++;
-					}
-				}
-			}
-			termList.setFromZones(fromZoneValue);
-
-			String toZoneValue = "";
-			int toZonecounter = 0;
-			if(termListDatas.getToZoneDatas().size() > 0){
-				for(Object toZone : termListDatas.getToZoneDatas()){
-					if(toZone instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) toZone).get("option").toString();
-						if(toZonecounter>0){
-							toZoneValue = toZoneValue + ",";
-						}
-						toZoneValue = toZoneValue + key ;
-						toZonecounter ++;
-					}
-				}
-			}
-			termList.setToZones(toZoneValue);
-
-			String srcListValues = "";
-			int srcListcounter = 0;
-			if(termListDatas.getSourceListDatas().size() > 0){
-				for(Object srcList : termListDatas.getSourceListDatas()){
-					if(srcList instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) srcList).get("option").toString();
-						if(srcListcounter>0){
-							srcListValues = srcListValues + ",";
-						}
-						srcListValues = srcListValues + key ;
-						srcListcounter ++;
-					}
-				}
-			}
-			termList.setSrcIPList(srcListValues);
-
-			String desListValues = "";
-			int destListcounter = 0;
-			if(termListDatas.getDestinationListDatas().size() > 0){
-				for(Object desList : termListDatas.getDestinationListDatas()){
-					if(desList instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) desList).get("option").toString();
-						if(destListcounter>0){
-							desListValues = desListValues + ",";
-						}
-						desListValues = desListValues + key ;
-						destListcounter ++;
-					}
-				}
-			}
-			termList.setDestIPList(desListValues);
-
-			String srcSerValue = "";
-			int srcSercounter = 0;
-			if(termListDatas.getSourceServiceDatas().size() > 0){
-				for(Object srcSrc : termListDatas.getSourceServiceDatas()){
-					if(srcSrc instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) srcSrc).get("option").toString();
-						if(srcSercounter>0){
-							srcSerValue = srcSerValue + ",";
-						}
-						srcSerValue = srcSerValue + key ;
-						srcSercounter ++;
-					}
-				}
-			}
-			termList.setSrcPortList(srcSerValue);
-
-			String desSrcValue = "";
-			int desSrccounter = 0;
-			if(termListDatas.getDestinationServiceDatas().size() > 0){
-				for(Object desSrc : termListDatas.getDestinationServiceDatas()){
-					if(desSrc instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) desSrc).get("option").toString();
-						if(desSrccounter>0){
-							desSrcValue = desSrcValue + ",";
-						}
-						desSrcValue = desSrcValue + key ;
-						desSrccounter ++;
-					}
-				}
-			}
-			termList.setDestPortList(desSrcValue);
-
-			String actionValue = "";
-			int actioncounter = 0;
-			if(termListDatas.getActionListDatas().size() > 0){
-				for(Object actionList : termListDatas.getActionListDatas()){
-					if(actionList instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) actionList).get("option").toString();
-						if(actioncounter>0){
-							actionValue = actionValue + ",";
-						}
-						actionValue = actionValue + key ;
-						actioncounter ++;
-					}
-				}
-			}
-			termList.setAction(actionValue);
-
-			if(termList.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(termList.getTermName(), "termName", TermList.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					termList.setUserCreatedBy(this.getUserInfo(userId));
-					termList.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(termList);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					termList.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.update(termList); 
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(TermList.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("{termListDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_termList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			TermList termList = (TermList)mapper.readValue(root.get("data").toString(), TermList.class);
-			commonClassDao.delete(termList);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(TermList.class));
-			JSONObject j = new JSONObject("{termListDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-	//ParentList Dictionary Data
-	@RequestMapping(value={"/get_FWDictionaryListDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getFWDictListDictionaryEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("fwDictListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(FirewallDictionaryList.class, "parentItemName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_FWDictionaryListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getFWDictionaryListEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("fwDictListDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(FirewallDictionaryList.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(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_FWDictionaryList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveFWDictionaryList(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			FirewallDictionaryList fwDictList = (FirewallDictionaryList)mapper.readValue(root.get("fwDictListDictionaryData").toString(), FirewallDictionaryList.class);
-			GridData gridData = (GridData)mapper.readValue(root.get("fwDictListDictionaryData").toString(), GridData.class);
-			String userSLValue = "";
-			int slcounter = 0;
-			if(gridData.getAttributes().size() > 0){
-				for(Object attribute : gridData.getAttributes()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						if(slcounter>0){
-							userSLValue = userSLValue + ",";
-						}
-						userSLValue = userSLValue + key ;
-						slcounter ++;
-					}
-				}
-			}
-			fwDictList.setServiceList(userSLValue);
-			String userALValue = "";
-			int alcounter = 0;
-			if(gridData.getAlAttributes().size() > 0){
-				for(Object attribute : gridData.getAlAttributes()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						if(alcounter>0){
-							userALValue = userALValue + ",";
-						}
-						userALValue = userALValue + key ;
-						alcounter ++;
-					}
-				}
-			}
-			fwDictList.setAddressList(userALValue);
-			if(fwDictList.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(fwDictList.getParentItemName(), "parentItemName", FirewallDictionaryList.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(fwDictList);
-				}
-			}else{
-				commonClassDao.update(fwDictList); 
-			} 
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(FirewallDictionaryList.class));
-			}
-			JSONObject j = new JSONObject("{fwDictListDictionaryDatas: " + responseString + "}");
-
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_FWDictionaryList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeFWDictionaryListy(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			FirewallDictionaryList fwDictList = (FirewallDictionaryList)mapper.readValue(root.get("data").toString(), FirewallDictionaryList.class);
-			commonClassDao.delete(fwDictList);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(FirewallDictionaryList.class));
-			JSONObject j = new JSONObject("{fwDictListDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-
-	@RequestMapping(value={"/get_TagPickerNameByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getTagPickerNameEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<String, Object>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("fwTagPickerDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(FWTagPicker.class, "tagPickerName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_TagPickerListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getTagPickerDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<String, Object>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("fwTagPickerDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(FWTagPicker.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_fwTagPicker"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveFirewallTagPickerDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-
-
-			FWTagPicker fwTagPicker;
-			TagGridValues data;
-			String userId = null;
-			if (fromAPI) {
-				fwTagPicker = (FWTagPicker)mapper.readValue(root.get("fwTagPickerDictionaryData").toString(), FWTagPicker.class);
-				data = (TagGridValues)mapper.readValue(root.get("fwTagPickerDictionaryData").toString(), TagGridValues.class);
-				userId = "API";
-
-				//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(fwTagPicker.getTagPickerName(), "tagPickerName", FWTagPicker.class);
-					int id = 0;
-					FWTagPicker dbdata = (FWTagPicker) duplicateData.get(0);
-					id = dbdata.getId();
-					fwTagPicker.setId(id);
-					fwTagPicker.setUserCreatedBy(this.getUserInfo(userId));
-				}
-			} else {
-
-				fwTagPicker = (FWTagPicker)mapper.readValue(root.get("fwTagPickerDictionaryData").toString(), FWTagPicker.class);
-				data = (TagGridValues)mapper.readValue(root.get("fwTagPickerDictionaryData").toString(), TagGridValues.class);
-				userId = root.get("userid").textValue();
-			}
-
-			String header = "";
-			int counter = 0;
-			if(data.getTags().size() > 0){
-				for(Object attribute : data.getTags()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("option").toString();
-						String value = ((LinkedHashMap<?, ?>) attribute).get("number").toString();
-						if(counter>0){
-							header = header + "#";
-						}
-						header = header + key + ":";
-						header = header + value;
-						counter ++;
-					}
-				}
-			}
-			fwTagPicker.setTagValues(header);
-			if(fwTagPicker.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(fwTagPicker.getTagPickerName(), "tagPickerName", FWTagPicker.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					fwTagPicker.setUserCreatedBy(this.getUserInfo(userId));
-					fwTagPicker.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(fwTagPicker);
-				}
-			}else{
-				fwTagPicker.setUserModifiedBy(this.getUserInfo(userId));
-				fwTagPicker.setModifiedDate(new Date());
-				commonClassDao.update(fwTagPicker); 
-			} 
-
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString =  mapper.writeValueAsString(commonClassDao.getData(FWTagPicker.class));
-			}
-
-			if (fromAPI) {
-				if (responseString!=null && !responseString.equals("Duplicate")) {
-					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("{fwTagPickerDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_tagPicker"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeFirewallTagPickerDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			FWTagPicker fwTagPicker = (FWTagPicker)mapper.readValue(root.get("data").toString(), FWTagPicker.class);
-			commonClassDao.delete(fwTagPicker);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(FWTagPicker.class));
-			JSONObject j = new JSONObject("{fwTagPickerDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-
-	@RequestMapping(value={"/get_TagNameByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getTagNameEntityDataByName(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("fwTagDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(FWTag.class, "fwTagName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/get_TagListData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getTagDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("fwTagDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(FWTag.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-	}
-
-	@RequestMapping(value={"/fw_dictionary/save_fwTag"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveFirewallTagDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-
-
-			FWTag fwTag;
-			TagGridValues tagGridValues;
-			String userId = null;
-			if (fromAPI) {
-				fwTag = (FWTag)mapper.readValue(root.get("fwTagDictionaryDatas").toString(), FWTag.class);
-				tagGridValues = (TagGridValues)mapper.readValue(root.get("fwTagDictionaryDatas").toString(), TagGridValues.class);
-				userId = "API";
-
-				//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(fwTag.getFwTagName(), "tagName", FWTag.class);
-					int id = 0;
-					FWTag data = (FWTag) duplicateData.get(0);
-					id = data.getId();
-					fwTag.setId(id);
-					fwTag.setUserCreatedBy(this.getUserInfo(userId));
-
-				}
-			} else {
-				fwTag = (FWTag)mapper.readValue(root.get("fwTagDictionaryData").toString(), FWTag.class);
-				tagGridValues = (TagGridValues)mapper.readValue(root.get("fwTagDictionaryData").toString(), TagGridValues.class);
-				userId = root.get("userid").textValue();
-			}
-
-			String userValue = "";
-			int counter = 0;
-			if(tagGridValues.getTags().size() > 0){
-				for(Object attribute : tagGridValues.getTags()){
-					if(attribute instanceof LinkedHashMap<?, ?>){
-						String key = ((LinkedHashMap<?, ?>) attribute).get("tags").toString();
-						if(counter>0){
-							userValue = userValue + ",";
-						}
-						userValue = userValue + key ;
-						counter ++;
-					}
-				}
-			}
-			fwTag.setTagValues(userValue);
-			if(fwTag.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(fwTag.getFwTagName(), "fwTagName", FWTag.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					fwTag.setUserCreatedBy(this.getUserInfo(userId));
-					fwTag.setUserModifiedBy(this.getUserInfo(userId));
-					commonClassDao.save(fwTag);
-				}   
-			}else{
-				fwTag.setUserModifiedBy(this.getUserInfo(userId));
-				fwTag.setModifiedDate(new Date());
-				commonClassDao.update(fwTag); 
-			} 
-
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString =  mapper.writeValueAsString(commonClassDao.getData(FWTag.class));
-			}
-			if (fromAPI) {
-				if (responseString!=null && !responseString.equals("Duplicate")) {
-					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("{fwTagDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/fw_dictionary/remove_tagList"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeFirewallTagDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			FWTag fwTag = (FWTag)mapper.readValue(root.get("data").toString(), FWTag.class);
-			commonClassDao.delete(fwTag);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(FWTag.class));
-			JSONObject j = new JSONObject("{fwTagDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-}
-
-class TagGridValues{
-	private ArrayList<Object> tags;
-
-	public ArrayList<Object> getTags() {
-		return tags;
-	}
-
-	public void setTags(ArrayList<Object> tags) {
-		this.tags = tags;
-	}
-}
-
-class AGGridData{
-	private ArrayList<Object> attributes;
-
-	public ArrayList<Object> getAttributes() {
-		return attributes;
-	}
-
-	public void setAttributes(ArrayList<Object> attributes) {
-		this.attributes = attributes;
-	}
-}
-
-class TermListData{
-	private ArrayList<Object> fromZoneDatas;
-	private ArrayList<Object> toZoneDatas;
-	private ArrayList<Object> sourceListDatas;
-	private ArrayList<Object> destinationListDatas;
-	private ArrayList<Object> sourceServiceDatas;
-	private ArrayList<Object> destinationServiceDatas;
-	private ArrayList<Object> actionListDatas;
-	public ArrayList<Object> getFromZoneDatas() {
-		return fromZoneDatas;
-	}
-	public void setFromZoneDatas(ArrayList<Object> fromZoneDatas) {
-		this.fromZoneDatas = fromZoneDatas;
-	}
-	public ArrayList<Object> getToZoneDatas() {
-		return toZoneDatas;
-	}
-	public void setToZoneDatas(ArrayList<Object> toZoneDatas) {
-		this.toZoneDatas = toZoneDatas;
-	}
-	public ArrayList<Object> getSourceListDatas() {
-		return sourceListDatas;
-	}
-	public void setSourceListDatas(ArrayList<Object> sourceListDatas) {
-		this.sourceListDatas = sourceListDatas;
-	}
-	public ArrayList<Object> getDestinationListDatas() {
-		return destinationListDatas;
-	}
-	public void setDestinationListDatas(ArrayList<Object> destinationListDatas) {
-		this.destinationListDatas = destinationListDatas;
-	}
-	public ArrayList<Object> getSourceServiceDatas() {
-		return sourceServiceDatas;
-	}
-	public void setSourceServiceDatas(ArrayList<Object> sourceServiceDatas) {
-		this.sourceServiceDatas = sourceServiceDatas;
-	}
-	public ArrayList<Object> getDestinationServiceDatas() {
-		return destinationServiceDatas;
-	}
-	public void setDestinationServiceDatas(ArrayList<Object> destinationServiceDatas) {
-		this.destinationServiceDatas = destinationServiceDatas;
-	}
-	public ArrayList<Object> getActionListDatas() {
-		return actionListDatas;
-	}
-	public void setActionListDatas(ArrayList<Object> actionListDatas) {
-		this.actionListDatas = actionListDatas;
-	}
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
deleted file mode 100644
index b933a4f84..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
+++ /dev/null
@@ -1,1051 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.DCAEuuid;
-import org.openecomp.policy.rest.jpa.MicroServiceAttribute;
-import org.openecomp.policy.rest.jpa.MicroServiceConfigName;
-import org.openecomp.policy.rest.jpa.MicroServiceLocation;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.openecomp.policy.rest.util.MSAttributeObject;
-import org.openecomp.policy.rest.util.MSModelUtils;
-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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-
-@Controller
-public class MicroServiceDictionaryController {
-	private static final Logger LOGGER  = FlexLogger.getLogger(MicroServiceDictionaryController.class);
-
-	private static CommonClassDao commonClassDao;
-
-	public static void setCommonClassDao(CommonClassDao commonClassDao) {
-		MicroServiceDictionaryController.commonClassDao = commonClassDao;
-	}
-
-	@Autowired
-	public MicroServiceDictionaryController(CommonClassDao commonClassDao){
-		MicroServiceDictionaryController.commonClassDao = commonClassDao;
-	}
-	
-	public MicroServiceDictionaryController(){}	
-	
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;	
-	}
-	
-    private static String SUCCESSKEY= "successMapKey";
-    private static String SUCCESS = "success";
-    private static String OPERATION = "operation";
-    private static String GETDICTIONARY = "getDictionary";
-    private static String ERROR = "error";
-    private static String DICTIONARYDBQUERY = "dictionaryDBQuery";
-    private HashMap<String,MSAttributeObject > classMap;
-    private List<String> modelList = new ArrayList<>();
-    
-	
-
-	MSModelUtils utils = new MSModelUtils(XACMLPapServlet.getMsEcompName(), XACMLPapServlet.getMsPolicyName());
-	private MicroServiceModels newModel;
-	
-	
-	@RequestMapping(value={"/get_DCAEUUIDDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getDCAEUUIDDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("dcaeUUIDDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(DCAEuuid.class, "name")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(e);
-		}
-	}
-
-	@RequestMapping(value={"/get_DCAEUUIDData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getDCAEUUIDDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("dcaeUUIDDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(DCAEuuid.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-            response.addHeader(SUCCESSKEY, 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.getMessage());
-		}
-	}
-	
-	@RequestMapping(value={"/ms_dictionary/save_dcaeUUID"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-            DCAEuuid dCAEuuid;
-            if (fromAPI) {
-                dCAEuuid = (DCAEuuid)mapper.readValue(root.get("dictionaryFields").toString(), DCAEuuid.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(dCAEuuid.getName(), "name", DCAEuuid.class);
-                	int id = 0;
-                	DCAEuuid data = (DCAEuuid) duplicateData.get(0);
-                	id = data.getId();
-                	if(id==0){
-                		isFakeUpdate=true;
-                		dCAEuuid.setId(1);
-                	} else {
-                		dCAEuuid.setId(id);
-                	}       
-                }
-            } else {
-            	dCAEuuid = (DCAEuuid)mapper.readValue(root.get("dcaeUUIDDictionaryData").toString(), DCAEuuid.class);
-            }
-			if(dCAEuuid.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(dCAEuuid.getName(), "name", DCAEuuid.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(dCAEuuid);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(dCAEuuid); 
-				}
-			} 
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(DCAEuuid.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("{dcaeUUIDDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        }catch (Exception e){
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/ms_dictionary/remove_dcaeuuid"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			DCAEuuid dCAEuuid = (DCAEuuid)mapper.readValue(root.get("data").toString(), DCAEuuid.class);
-			commonClassDao.delete(dCAEuuid);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(DCAEuuid.class));
-			JSONObject j = new JSONObject("{dcaeUUIDDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-	
-	
-	@RequestMapping(value={"/get_MicroServiceConfigNameDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getMicroServiceConfigNameByNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("microServiceCongigNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(MicroServiceConfigName.class, "name")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(e);
-		}
-	}
-	
-	
-	
-	@RequestMapping(value={"/get_MicroServiceConfigNameData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getMicroServiceConfigNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("microServiceCongigNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(MicroServiceConfigName.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-            response.addHeader(SUCCESSKEY, 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.getMessage());
-		}
-	}
-	
-	@RequestMapping(value={"/ms_dictionary/save_configName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-            MicroServiceConfigName microServiceConfigName;
-            if (fromAPI) {
-                microServiceConfigName = (MicroServiceConfigName)mapper.readValue(root.get("dictionaryFields").toString(), MicroServiceConfigName.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(microServiceConfigName.getName(), "name", MicroServiceConfigName.class);
-                    int id = 0;
-                    MicroServiceConfigName data = (MicroServiceConfigName) duplicateData.get(0);
-                    id = data.getId();
-                
-                    if(id==0){
-                        isFakeUpdate=true;
-                        microServiceConfigName.setId(1);
-                    } else {
-                        microServiceConfigName.setId(id);
-                    }  
-                }
-            } else {
-            	microServiceConfigName = (MicroServiceConfigName)mapper.readValue(root.get("microServiceCongigNameDictionaryData").toString(), MicroServiceConfigName.class);
-            }
-			if(microServiceConfigName.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(microServiceConfigName.getName(), "name", MicroServiceConfigName.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(microServiceConfigName);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(microServiceConfigName); 
-				}
-			} 
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(MicroServiceConfigName.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("{microServiceCongigNameDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        }catch (Exception e){
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/ms_dictionary/remove_msConfigName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			MicroServiceConfigName microServiceConfigName = (MicroServiceConfigName)mapper.readValue(root.get("data").toString(), MicroServiceConfigName.class);
-			commonClassDao.delete(microServiceConfigName);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(MicroServiceConfigName.class));
-			JSONObject j = new JSONObject("{microServiceCongigNameDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-	
-	@RequestMapping(value={"/get_MicroServiceLocationDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getMicroServiceLocationByNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("microServiceLocationDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(MicroServiceLocation.class, "name")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error(e);
-		}
-	}
-	
-	@RequestMapping(value={"/get_MicroServiceLocationData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getMicroServiceLocationDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("microServiceLocationDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(MicroServiceLocation.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-            response.addHeader(SUCCESSKEY, 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.getMessage());
-		}
-	}
-	
-	@RequestMapping(value={"/ms_dictionary/save_location"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-            MicroServiceLocation microServiceLocation;
-            if (fromAPI) {
-                microServiceLocation = (MicroServiceLocation)mapper.readValue(root.get("dictionaryFields").toString(), MicroServiceLocation.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(microServiceLocation.getName(), "name", MicroServiceLocation.class);
-                    int id = 0;
-                    MicroServiceLocation data = (MicroServiceLocation) duplicateData.get(0);
-                    id = data.getId();
-                  
-                    if(id==0){
-                        isFakeUpdate=true;
-                        microServiceLocation.setId(1);
-                    } else {
-                        microServiceLocation.setId(id);
-                    }
-                }
-            } else {
-            	microServiceLocation = (MicroServiceLocation)mapper.readValue(root.get("microServiceLocationDictionaryData").toString(), MicroServiceLocation.class);
-            }
-			if(microServiceLocation.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(microServiceLocation.getName(), "name", MicroServiceLocation.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(microServiceLocation);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(microServiceLocation); 
-				}
-			} 
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(MicroServiceLocation.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("{microServiceLocationDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-		}catch (Exception e){
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/ms_dictionary/remove_msLocation"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			MicroServiceLocation microServiceLocation = (MicroServiceLocation)mapper.readValue(root.get("data").toString(), MicroServiceLocation.class);
-			commonClassDao.delete(microServiceLocation);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(MicroServiceLocation.class));
-			JSONObject j = new JSONObject("{microServiceLocationDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-	
-    @RequestMapping(value={"/get_MicroServiceAttributeDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getMicroServiceAttributeByNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            model.put("microServiceAttributeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(MicroServiceAttribute.class, "name")));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.getWriter().write(j.toString());
-        }
-        catch (Exception e){
-            LOGGER.error(e.getMessage());
-        }
-    }
-    
-    @RequestMapping(value={"/get_MicroServiceAttributeData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getMicroServiceAttributeDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            model.put("microServiceAttributeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(MicroServiceAttribute.class)));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.addHeader(SUCCESSKEY, 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.getMessage());
-        }
-    }
-    
-    @RequestMapping(value={"/ms_dictionary/save_modelAttribute"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-    public ModelAndView saveMicroServiceAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-        try {
-            boolean duplicateflag = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-            
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            JsonNode root = mapper.readTree(request.getReader());
-            
-            MicroServiceAttribute microServiceAttribute;
-            if (fromAPI) {
-                microServiceAttribute = (MicroServiceAttribute)mapper.readValue(root.get("dictionaryFields").toString(), MicroServiceAttribute.class);
-                
-                //check if update operation or create, get id for data to be updated and update attributeData
-                if (request.getParameter(OPERATION).equals("update")) {
-                    MicroServiceAttribute initialAttribute = (MicroServiceAttribute)mapper.readValue(root.get("initialFields").toString(), MicroServiceAttribute.class);
- 
-                    String checkValue = initialAttribute.getName() + ":" + initialAttribute.getValue() + ":" + initialAttribute.getModelName();
-                    List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(checkValue, "name:value:modelName", MicroServiceAttribute.class);
-                    int id=0;
-                    for (int i= 0; i<duplicateData.size(); i++){
-                        MicroServiceAttribute data = (MicroServiceAttribute) duplicateData.get(0);
-                        id = data.getId();
-                    }
-                    microServiceAttribute.setId(id);                
-                }
-            } else {
-                microServiceAttribute = (MicroServiceAttribute)mapper.readValue(root.get("modelAttributeDictionaryData").toString(), MicroServiceAttribute.class);
-            }
-            
-            if(microServiceAttribute.getId() == 0){
-                String checkValue = microServiceAttribute.getName() + ":" + microServiceAttribute.getValue() + ":" + microServiceAttribute.getModelName();
-                List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(checkValue, "name:value:modelName", MicroServiceAttribute.class);
-                if(!duplicateData.isEmpty()){
-                    duplicateflag = true;
-                }else{
-                	commonClassDao.save(microServiceAttribute);
-                }
-            }else{
-            	commonClassDao.update(microServiceAttribute); 
-            } 
- 
-            String responseString = "";
-            if(duplicateflag){
-                responseString = "Duplicate";
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(MicroServiceAttribute.class));
-            }
-            
-            if (fromAPI) {
-                if (responseString!=null && !responseString.equals("Duplicate")) {
-                    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("{microServiceAttributeDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        }
-        catch (Exception e){
-            response.setCharacterEncoding("UTF-8");
-            request.setCharacterEncoding("UTF-8");
-            PrintWriter out = response.getWriter();
-            out.write(e.getMessage());
-        }
-        return null;
-    }
- 
-    @RequestMapping(value={"/ms_dictionary/remove_modelAttribute"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-    public ModelAndView removeMicroServiceAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        try{
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            JsonNode root = mapper.readTree(request.getReader());
-            MicroServiceAttribute microServiceAttribute = (MicroServiceAttribute)mapper.readValue(root.get("data").toString(), MicroServiceAttribute.class);
-            commonClassDao.delete(microServiceAttribute);
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application / json");
-            request.setCharacterEncoding("UTF-8");
- 
-            PrintWriter out = response.getWriter();
- 
-            String responseString = mapper.writeValueAsString(MicroServiceDictionaryController.commonClassDao.getData(MicroServiceAttribute.class));
-            JSONObject j = new JSONObject("{microServiceAttributeDictionaryDatas: " + responseString + "}");
-            out.write(j.toString());
- 
-            return null;
-        }
-        catch (Exception e){
-            LOGGER.error(e.getMessage());
-            response.setCharacterEncoding("UTF-8");
-            request.setCharacterEncoding("UTF-8");
-            PrintWriter out = response.getWriter();
-            out.write(e.getMessage());
-        }
-        return null;
-    }
- 
-	
-	@RequestMapping(value={"/get_MicroServiceModelsDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getMicroServiceModelsDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("microServiceModelsDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(MicroServiceModels.class, "modelName")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			 LOGGER.error(e.getMessage());
-		}
-	}
-	
-    @RequestMapping(value={"/get_MicroServiceModelsDataByVersion"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getMicroServiceModelsDictionaryByVersionEntityData(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            JsonNode root = mapper.readTree(request.getReader());
-            String modelName = null;
-            if (root.get("microServiceModelsDictionaryData").has("modelName")){
-                modelName = root.get("microServiceModelsDictionaryData").get("modelName").asText().replace("\"", "");
-            }
-             if (modelName!=null){
-                    model.put("microServiceModelsDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataById(MicroServiceModels.class, "modelName", modelName)));
-             } else{
-                 model.put(ERROR, "No model name given");
-             }
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.getWriter().write(j.toString());
-        }
-        catch (Exception e){
-            LOGGER.error(e.getMessage());
-        }
-    }
-    
-	@RequestMapping(value={"/get_MicroServiceModelsData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getMicroServiceModelsDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("microServiceModelsDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(MicroServiceModels.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-            response.addHeader(SUCCESSKEY, 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.getMessage());
-		}
-	}
-	
-    @RequestMapping(value={"/get_MicroServiceModelsDataServiceVersion"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getMicroServiceModelsDictionaryEntityDataServiceVersion(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            List<String> data = new ArrayList<>();
-            List<Object> datas = commonClassDao.getData(MicroServiceModels.class);
-            for(int i = 0; i < datas.size(); i++){
-            	MicroServiceModels msmodel = (MicroServiceModels) datas.get(i);
-                if (!data.contains(msmodel.getModelName())){
-                	data.add(msmodel.getModelName() + "-v" + msmodel.getVersion());
-                }
-            }
-            model.put("microServiceModelsDictionaryDatas", mapper.writeValueAsString(data));
-            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_MicroServiceModelsDataByClass"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-    public void getMicroServiceModelsDictionaryClassEntityData(HttpServletRequest request, HttpServletResponse response){
-        try{
-            Map<String, Object> model = new HashMap<>();
-            ObjectMapper mapper = new ObjectMapper();
-            model.put("microServiceModelsDictionaryClassDatas", mapper.writeValueAsString(modelList));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.addHeader(SUCCESSKEY, 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.getMessage());
-        }
-    }
-    
-	@RequestMapping(value={"/ms_dictionary/save_model"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView saveMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean fromAPI = false;
-			this.newModel = new MicroServiceModels();
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			MicroServiceModels microServiceModels = new MicroServiceModels();
-			String userId = null;
-
-			if(root.has("modelType")){
-				JsonNode dataType = root.get("modelType");
-				String modelType= dataType.toString();
-				if(modelType.contains("yml")){
-					if (root.has("microServiceModelsDictionaryData")){
-						if (root.get("microServiceModelsDictionaryData").has("description")){
-							microServiceModels.setDescription(root.get("microServiceModelsDictionaryData").get("description").asText().replace("\"", ""));
-						}
-						if (root.get("microServiceModelsDictionaryData").has("modelName")){
-							microServiceModels.setModelName(root.get("microServiceModelsDictionaryData").get("modelName").asText().replace("\"", ""));
-							this.newModel.setModelName(microServiceModels.getModelName());
-						}
-						if (root.get("microServiceModelsDictionaryData").has("version")){
-							microServiceModels.setVersion(root.get("microServiceModelsDictionaryData").get("version").asText().replace("\"", ""));
-							this.newModel.setVersion(microServiceModels.getVersion());
-						}
-					}
-
-					MSAttributeObject mainClass  = null;
-					classMap = new HashMap<>();
-					JsonNode data = root.get("classMap");
-					ObjectMapper mapper1 = new ObjectMapper();
-					String data1 = data.toString().substring(1, data.toString().length()-1);
-					data1 = data1.replace("\\", "");
-					data1=data1.replace("\"{","{");
-					data1=data1.replace("}\"","}");
-					JSONObject jsonObject = new JSONObject(data1);
-					Set<String> keys = jsonObject.keySet();
-					for(String key : keys){
-						String value = jsonObject.get(key).toString();
-						MSAttributeObject msAttributeObject = mapper1.readValue(value, MSAttributeObject.class);
-						classMap.put(key, msAttributeObject);
-					}
-
-					userId = root.get("userid").textValue();
-					mainClass = classMap.get(this.newModel.getModelName());
-					this.newModel.setDependency("[]");
-					String value = new Gson().toJson(mainClass.getSubClass());
-					this.newModel.setSub_attributes(value);
-					String attributes= mainClass.getAttribute().toString().replace("{", "").replace("}", "");
-					int equalsIndexForAttributes= attributes.indexOf("=");
-					String atttributesAfterFirstEquals= attributes.substring(equalsIndexForAttributes+1);
-					this.newModel.setAttributes(atttributesAfterFirstEquals);
-					String refAttributes= mainClass.getRefAttribute().toString().replace("{", "").replace("}", "");
-					int equalsIndex= refAttributes.indexOf("=");
-					String refAttributesAfterFirstEquals= refAttributes.substring(equalsIndex+1);
-					this.newModel.setRef_attributes(refAttributesAfterFirstEquals);
-					this.newModel.setEnumValues(mainClass.getEnumType().toString().replace("{", "").replace("}", ""));
-					this.newModel.setAnnotation(mainClass.getMatchingSet().toString().replace("{", "").replace("}", ""));
-
-				}else{
-					if (fromAPI) {
-						microServiceModels = (MicroServiceModels)mapper.readValue(root.get("dictionaryFields").toString(), MicroServiceModels.class);
-						userId = "API";
-
-						//check if update operation or create, get id for data to be updated and update attributeData
-						if (request.getParameter(OPERATION).equals("update")) {
-							String checkName = microServiceModels.getModelName() + ":" + microServiceModels.getVersion();
-							List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(checkName, "modelName:version", MicroServiceModels.class);
-							int id = 0;
-							for (int i=0; i< duplicateData.size(); i++){
-								MicroServiceModels data = (MicroServiceModels) duplicateData.get(0);
-								id = data.getId();
-							}
-							microServiceModels.setId(id);
-							microServiceModels.setUserCreatedBy(this.getUserInfo(userId));
-
-						}
-					} else {
-						if (root.has("microServiceModelsDictionaryData")){
-							if (root.get("microServiceModelsDictionaryData").has("description")){
-								microServiceModels.setDescription(root.get("microServiceModelsDictionaryData").get("description").asText().replace("\"", ""));
-							}
-							if (root.get("microServiceModelsDictionaryData").has("modelName")){
-								microServiceModels.setModelName(root.get("microServiceModelsDictionaryData").get("modelName").asText().replace("\"", ""));
-								this.newModel.setModelName(microServiceModels.getModelName());
-							}
-							if (root.get("microServiceModelsDictionaryData").has("version")){
-								microServiceModels.setVersion(root.get("microServiceModelsDictionaryData").get("version").asText().replace("\"", ""));
-								this.newModel.setVersion(microServiceModels.getVersion());
-							}
-						}
-						if(root.has("classMap")){
-							classMap = new HashMap<>();
-							JsonNode data = root.get("classMap");
-							ObjectMapper mapper1 = new ObjectMapper();
-							String data1 = data.toString().substring(1, data.toString().length()-1);
-							data1 = data1.replace("\\", "");
-							JSONObject jsonObject = new JSONObject(data1);
-							Set<String> keys = jsonObject.keySet();
-							for(String key : keys){
-								String value = jsonObject.get(key).toString();
-								MSAttributeObject msAttributeObject = mapper1.readValue(value, MSAttributeObject.class);
-								classMap.put(key, msAttributeObject);
-							}
-						}
-						userId = root.get("userid").textValue();
-						addValuesToNewModel(classMap);
-					}
-				}		
-
-			}
-			microServiceModels.setAttributes(this.newModel.getAttributes());
-			microServiceModels.setRef_attributes(this.newModel.getRef_attributes());
-			microServiceModels.setDependency(this.newModel.getDependency());
-			microServiceModels.setModelName(this.newModel.getModelName());
-			microServiceModels.setSub_attributes(this.newModel.getSub_attributes());
-			microServiceModels.setVersion(this.newModel.getVersion());
-			microServiceModels.setEnumValues(this.newModel.getEnumValues());
-			microServiceModels.setAnnotation(this.newModel.getAnnotation());
-
-			if(microServiceModels.getId() == 0){
-				String checkName = microServiceModels.getModelName() + ":" + microServiceModels.getVersion();
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(checkName, "modelName:version", MicroServiceModels.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					microServiceModels.setUserCreatedBy(this.getUserInfo(userId));
-					commonClassDao.save(microServiceModels);
-				}
-			}else{
-				commonClassDao.update(microServiceModels); 
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(MicroServiceModels.class));
-			} 
-
-			if (fromAPI) {
-				if (responseString!=null && !responseString.equals("Duplicate")) {
-					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("{microServiceModelsDictionaryDatas: " + responseString + "}");
-				out.write(j.toString());
-				return null;
-			}
-		}catch (Exception e){
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value={"/ms_dictionary/remove_msModel"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removeMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			MicroServiceModels microServiceModels = (MicroServiceModels)mapper.readValue(root.get("data").toString(), MicroServiceModels.class);
-			commonClassDao.delete(microServiceModels);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(MicroServiceModels.class));
-			JSONObject j = new JSONObject("{microServiceModelsDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			LOGGER.error(e);
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-		
-	private void addValuesToNewModel(HashMap<String,MSAttributeObject > classMap) {
-		new MicroServiceModels();
-		//Loop  through the classmap and pull out the required info for the new file.
-		MSAttributeObject mainClass  = null;
-		ArrayList<String> dependency = null;
-		String subAttribute = null;
-		
-		mainClass = classMap.get(this.newModel.getModelName());
-		
-		if (mainClass !=null){
-			String dependTemp = StringUtils.replaceEach(mainClass.getDependency(), new String[]{"[", "]", " "}, new String[]{"", "", ""});
-			dependency = new ArrayList<String>(Arrays.asList(dependTemp.split(",")));	
-			dependency = getFullDependencyList(dependency);
-			for (String element : dependency){
-				MSAttributeObject temp = new MSAttributeObject();
-				temp = classMap.get(element);
-				if (temp!=null){
-					mainClass.addAllRefAttribute(temp.getRefAttribute());
-					mainClass.addAllAttribute(temp.getAttribute());
-				}
-			}
-			subAttribute = utils.createSubAttributes(dependency, classMap, this.newModel.getModelName());
-		}else{
-			subAttribute = "{}";
-			this.newModel.setDependency("");
-		}
-
-		if (mainClass != null && mainClass.getDependency()==null){
-			mainClass.setDependency("");
-		}
-		if(mainClass != null){
-			this.newModel.setDependency(mainClass.getDependency());
-			this.newModel.setSub_attributes(subAttribute);
-			this.newModel.setAttributes(mainClass.getAttribute().toString().replace("{", "").replace("}", ""));
-			this.newModel.setRef_attributes(mainClass.getRefAttribute().toString().replace("{", "").replace("}", ""));
-			this.newModel.setEnumValues(mainClass.getEnumType().toString().replace("{", "").replace("}", ""));
-			this.newModel.setAnnotation(mainClass.getMatchingSet().toString().replace("{", "").replace("}", ""));
-		}
-	} 
-	
-	private ArrayList<String> getFullDependencyList(ArrayList<String> dependency) {
-		ArrayList<String> returnList = new ArrayList<>();
-		ArrayList<String> workingList = new ArrayList<>();
-		returnList.addAll(dependency);
-		for (String element : dependency ){
-			if (classMap.containsKey(element)){
-				MSAttributeObject value = classMap.get(element);			
-				String rawValue = StringUtils.replaceEach(value.getDependency(), new String[]{"[", "]"}, new String[]{"", ""});
-				workingList = new ArrayList<String>(Arrays.asList(rawValue.split(",")));	
-				for(String depend : workingList){
-					if (!returnList.contains(depend) && !depend.isEmpty()){
-						returnList.add(depend.trim());
-						//getFullDepedency(workingList)
-					}
-				}
-			}
-		}
-		
-		return returnList;
-	}
-
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PolicyScopeDictionaryController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PolicyScopeDictionaryController.java
deleted file mode 100644
index 08635c157..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PolicyScopeDictionaryController.java
+++ /dev/null
@@ -1,927 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-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.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.GroupPolicyScopeList;
-import org.openecomp.policy.rest.jpa.PolicyScopeClosedLoop;
-import org.openecomp.policy.rest.jpa.PolicyScopeResource;
-import org.openecomp.policy.rest.jpa.PolicyScopeService;
-import org.openecomp.policy.rest.jpa.PolicyScopeType;
-import org.openecomp.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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class PolicyScopeDictionaryController {
-
-	private static final Logger LOGGER  = FlexLogger.getLogger(PolicyScopeDictionaryController.class);
-
-	private static CommonClassDao commonClassDao;
-	
-	@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;	
-	}
-
-	@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_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={"/ps_dictionary/save_psGroupPolicyScope"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		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;
-			}
-
-			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;
-			if (fromAPI) {
-				gpdata = (GroupPolicyScopeList)mapper.readValue(root.get("dictionaryFields").toString(), GroupPolicyScopeList.class);
-				try{
-					groupData = (GroupPolicyScope)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("\"", ""));
-				}
-
-				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);
-
-				try{
-					groupData = (GroupPolicyScope)mapper.readValue(root.get("groupPolicyScopeListData1").toString(), GroupPolicyScope.class);
-				}catch(Exception 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);
-				}
-
-			}
-			ArrayList<String> valueList = new ArrayList<>();
-			String list = null;
-			String resourceValue = groupData.getResource();
-			String typeValue = groupData.getType();
-			String serviceValue = groupData.getService();
-			String closedLoopValue = groupData.getClosedloop();
-			valueList.add("resource=" + resourceValue);
-			valueList.add("service=" + serviceValue);
-			valueList.add("type=" + typeValue);
-			valueList.add("closedLoopControlName="  + closedLoopValue);
-			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()){
-					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";
-			}else if(duplicateGroupFlag){
-				responseString = "DuplicateGroup";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(GroupPolicyScopeList.class));
-			}
-
-			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;
-			}
-		}catch (Exception 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={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			GroupPolicyScopeList ecompData = (GroupPolicyScopeList)mapper.readValue(root.get("data").toString(), GroupPolicyScopeList.class);
-			commonClassDao.delete(ecompData);
-			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={"/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_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={"/ps_dictionary/save_psClosedLoop"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeClosedLoop ecompData;
-			if (fromAPI) {
-				ecompData = (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(ecompData.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;
-						ecompData.setId(1);
-					} else {
-						ecompData.setId(id);
-					}   
-
-				}
-			} else {
-				ecompData = (PolicyScopeClosedLoop)mapper.readValue(root.get("psClosedLoopDictionaryData").toString(), PolicyScopeClosedLoop.class);
-			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeClosedLoop.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(ecompData);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(ecompData); 
-				}
-			} 
-			String responseString = "";
-			if(duplicateflag){
-				responseString = "Duplicate";
-			}else{
-				responseString = mapper.writeValueAsString(commonClassDao.getData(PolicyScopeClosedLoop.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("{psClosedLoopDictionaryDatas: " + responseString + "}");
-
-				out.write(j.toString());
-
-				return null;
-			}
-
-		}catch (Exception 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={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeClosedLoop ecompData = (PolicyScopeClosedLoop)mapper.readValue(root.get("data").toString(), PolicyScopeClosedLoop.class);
-			commonClassDao.delete(ecompData);
-			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={"/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_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={"/ps_dictionary/save_psService"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeService ecompData;
-			if (fromAPI) {
-				ecompData = (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(ecompData.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;
-						ecompData.setId(1);
-					} else {
-						ecompData.setId(id);
-					}
-				}
-			} else {
-				ecompData = (PolicyScopeService)mapper.readValue(root.get("psServiceDictionaryData").toString(), PolicyScopeService.class);
-			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeService.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(ecompData);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(ecompData); 
-				}
-			} 
-
-			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;
-			}
-		}catch (Exception 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={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeService ecompData = (PolicyScopeService)mapper.readValue(root.get("data").toString(), PolicyScopeService.class);
-			commonClassDao.delete(ecompData);
-			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={"/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_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={"/ps_dictionary/save_psType"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeType ecompData;
-			if (fromAPI) {
-				ecompData = (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(ecompData.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;
-						ecompData.setId(1);
-					} else {
-						ecompData.setId(id);
-					}   
-
-				}
-			} else {
-				ecompData = (PolicyScopeType)mapper.readValue(root.get("psTypeDictionaryData").toString(), PolicyScopeType.class);
-			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeType.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(ecompData);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(ecompData); 
-				}
-			} 
-			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;
-			}
-
-		}catch (Exception 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={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeType ecompData = (PolicyScopeType)mapper.readValue(root.get("data").toString(), PolicyScopeType.class);
-			commonClassDao.delete(ecompData);
-			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={"/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_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){
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-			response.addHeader("error", "dictionaryDBQuery");
-			LOGGER.error(e);
-		}
-	}
-
-	@RequestMapping(value={"/ps_dictionary/save_psResource"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		try {
-			boolean duplicateflag = false;
-			boolean isFakeUpdate = false;
-			boolean fromAPI = false;
-			if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-				fromAPI = true;
-			}
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeResource ecompData;
-			if (fromAPI) {
-				ecompData = (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(ecompData.getName(), "name", PolicyScopeResource.class);
-					int id = 0;
-					PolicyScopeResource data = (PolicyScopeResource) duplicateData.get(0);
-					id = data.getId();
-
-					if(id==0){
-						isFakeUpdate=true;
-						ecompData.setId(1);
-					} else {
-						ecompData.setId(id);
-					}
-				}
-			} else {
-				ecompData = (PolicyScopeResource)mapper.readValue(root.get("psResourceDictionaryData").toString(), PolicyScopeResource.class);
-			}
-			if(ecompData.getId() == 0){
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(ecompData.getName(), "name", PolicyScopeResource.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(ecompData);
-				}
-			}else{
-				if(!isFakeUpdate) {
-					commonClassDao.update(ecompData); 
-				}
-			} 
-			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;
-			}
-
-		}catch (Exception 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={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-		try{
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			PolicyScopeResource ecompData = (PolicyScopeResource)mapper.readValue(root.get("data").toString(), PolicyScopeResource.class);
-			commonClassDao.delete(ecompData);
-			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;
-	}
-}
-
-class GroupPolicyScope{
-	String resource;
-	String type;
-	String service;
-	String closedloop;
-	public String getResource() {
-		return resource;
-	}
-	public void setResource(String resource) {
-		this.resource = resource;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public String getService() {
-		return service;
-	}
-	public void setService(String service) {
-		this.service = service;
-	}
-	public String getClosedloop() {
-		return closedloop;
-	}
-	public void setClosedloop(String closedloop) {
-		this.closedloop = closedloop;
-	}
-
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PushPolicyController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PushPolicyController.java
deleted file mode 100644
index 3f86378ab..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/PushPolicyController.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.net.URI;
-import java.util.List;
-import java.util.UUID;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.XACMLPapServlet;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.rest.jpa.PolicyVersion;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.att.research.xacml.api.pap.PAPException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class PushPolicyController {
-	private static final Logger LOGGER  = FlexLogger.getLogger(PushPolicyController.class);
-	
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public PushPolicyController(CommonClassDao commonClassDao){
-		PushPolicyController.commonClassDao = commonClassDao;
-	}
-	
-	public PushPolicyController(){}
-	
-	@RequestMapping(value="/pushPolicy", method=RequestMethod.POST)
-	public void pushPolicy(HttpServletRequest request, HttpServletResponse response){
-		ObjectMapper mapper = new ObjectMapper();
-		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-		try {
-			JsonNode root = mapper.readTree(request.getInputStream());
-			String policyScope = root.get("policyScope").asText();
-			String filePrefix = root.get("filePrefix").asText();
-			String policyName = root.get("policyName").asText();
-			String pdpGroup = root.get("pdpGroup").asText();
-			String requestID = request.getHeader("X-ECOMP-RequestID");
-			if(requestID==null){
-				requestID = UUID.randomUUID().toString();
-                LOGGER.info("No request ID provided, sending generated ID: " + requestID.toString());
-			}
-			LOGGER.info("Push policy Request : " + root.asText());
-			String policyVersionName = policyScope.replace(".", File.separator) + File.separator
-					+ filePrefix + policyName;
-			List<?> policyVersionObject = commonClassDao.getDataById(PolicyVersion.class, "policyName", policyVersionName);
-			if(policyVersionObject!=null){
-				PolicyVersion policyVersion = (PolicyVersion) policyVersionObject.get(0);
-				String policyID = policyVersionName.replace(File.separator, "."); // This is before adding version.
-				policyVersionName += "." + policyVersion.getActiveVersion() + ".xml";
-				addPolicyToGroup(policyScope, policyID, policyVersionName.replace(File.separator, "."), pdpGroup, response);
-			}else{
-				String message = "Unknown Policy '" + policyName + "'";
-				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " " + message);
-				response.addHeader("error", "unknownPolicy");
-				response.addHeader("operation", "push");
-				response.addHeader("message", message);
-				response.setStatus(HttpServletResponse.SC_NOT_FOUND);
-				return;
-			}
-			//safetyChecker(policyName);
-		} catch (NullPointerException | IOException e) {
-			LOGGER.error(e);
-			response.setStatus(HttpServletResponse.SC_NOT_FOUND);
-			response.addHeader("error", "unknown");
-			response.addHeader("operation", "push");
-			return;
-		}
-	}
-
-	private void addPolicyToGroup(String policyScope, String policyID, String policyName, String pdpGroup, HttpServletResponse response) {
-		StdPDPGroup selectedPDPGroup = null;
-		StdPDPPolicy selectedPolicy = null;
-		//Get the current policies from the Group and Add the new one
-		//Set<PDPPolicy> currentPoliciesInGroup = null;
-		try {
-			selectedPDPGroup = (StdPDPGroup) XACMLPapServlet.getPAPEngine().getGroup(pdpGroup);
-		} catch (PAPException e1) {
-			PolicyLogger.error(e1);
-		}
-		if(selectedPDPGroup==null){
-			String message = "Unknown groupId '" + selectedPDPGroup + "'";
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " " + message);
-			response.addHeader("error", "unknownGroupId");
-			response.addHeader("operation", "push");
-			response.addHeader("message", message);
-			response.setStatus(HttpServletResponse.SC_NOT_FOUND);
-			return;
-		}
-		//Get PolicyEntity from DB;
-		EntityManager em = XACMLPapServlet.getEmf().createEntityManager();
-		Query createPolicyQuery = em.createQuery("SELECT p FROM PolicyEntity p WHERE p.scope=:scope AND p.policyName=:policyName");			
-		createPolicyQuery.setParameter("scope", policyScope);
-		createPolicyQuery.setParameter("policyName", policyName.substring(policyScope.length()+1));
-		List<?> createPolicyQueryList = createPolicyQuery.getResultList();
-		PolicyEntity policyEntity = null;
-		if(createPolicyQueryList.size()>0){
-			policyEntity = (PolicyEntity)createPolicyQueryList.get(0);
-		}else{
-			PolicyLogger.error("Somehow, more than one policy with the same scope, name, and deleted status were found in the database");
-			String message = "Unknown Policy '" + policyName + "'";
-			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " " + message);
-			response.addHeader("error", "unknownPolicy");
-			response.addHeader("operation", "push");
-			response.addHeader("message", message);
-			response.setStatus(HttpServletResponse.SC_NOT_FOUND);
-			return;
-		}
-		File temp = new File(policyName);
-		try {
-			BufferedWriter bw = new BufferedWriter(new FileWriter(temp));
-			bw.write(policyEntity.getPolicyData());
-			bw.close();
-			URI selectedURI = temp.toURI();
-			// Create the policy Object
-			selectedPolicy = new StdPDPPolicy(policyName, true, policyID, selectedURI);
-		} catch (IOException e) {
-			LOGGER.error("Unable to create policy '" + policyName + "': "+ e.getMessage());
-		} 
-		try {
-			new ObjectOutputStream(response.getOutputStream()).writeObject(selectedPolicy);
-		} catch (IOException e) {
-			LOGGER.error(e);
-			response.addHeader("error", "policyCopyError");
-			response.addHeader("message", e.getMessage());
-			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-			return;
-		}
-		response.addHeader("Content-Type","application/json");
-		response.setStatus(HttpServletResponse.SC_ACCEPTED);
-		response.addHeader("operation", "push");
-		response.addHeader("policyId", policyName);
-		return;
-		// TODO : Check point to push policies within PAP. 
-		/*PolicyDBDaoTransaction addPolicyToGroupTransaction = XACMLPapServlet.getDbDaoTransaction();
-		try{
-			if (selectedPolicy != null) {
-				// Add Current policies from container
-				currentPoliciesInGroup = selectedPDPGroup.getPolicies();
-				// copy policy to PAP
-				addPolicyToGroupTransaction.addPolicyToGroup(selectedPDPGroup.getId(), policyName,"XACMLPapServlet.pushPolicyController");
-				((StdPDPGroup) selectedPDPGroup).copyPolicyToFile(policyName, policyID, new FileInputStream(temp));
-				addPolicyToGroupTransaction.commitTransaction();
-			}
-		}catch (Exception e) {
-			addPolicyToGroupTransaction.rollbackTransaction();
-			String message = "Policy '" + policyName + "' not copied to group '" + pdpGroup +"': " + e;
-			PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW + " " + message);
-			PolicyLogger.audit("Transaction Failed - See Error.log");
-			response.addHeader("error", "policyCopyError");
-			response.addHeader("message", message);
-			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-			return;
-		}
-		//If the selected policy is in the group we must remove it because the name is default
-		for (PDPPolicy existingPolicy : currentPoliciesInGroup) {
-			if (existingPolicy.getId().equals(selectedPolicy.getId())) {
-				selectedPDPGroup.removePolicyFromGroup(existingPolicy);
-				LOGGER.debug("Removing existing policy: " + existingPolicy);
-				break;
-			}
-		}
-		//Update the PDP Group after removing old version of policy
-		//Set<PDPPolicy> updatedPoliciesInGroup = selectedPDPGroup.getPolicies();
-		//need to remove the policy with default name from group
-		for (PDPPolicy updatedPolicy : currentPoliciesInGroup) {
-			if (updatedPolicy.getName().equalsIgnoreCase("default")) {
-				selectedPDPGroup.removePolicyFromGroup(updatedPolicy);
-			}
-		}
-		Set<PDPPolicy> policies = selectedPDPGroup.getPolicies();
-		policies.add(selectedPolicy);
-		selectedPDPGroup.setPolicies(policies);
-		// Update now. 
-		try {
-			XACMLPapServlet.getPAPEngine().updateGroup(selectedPDPGroup);
-		} catch (PAPException e) {
-			// TODO Auto-generated catch block
-			logger.error("Exception Occured"+e);
-		}
-		// policy file copied ok and the Group was updated on the PDP
-		response.setStatus(HttpServletResponse.SC_NO_CONTENT);
-		response.addHeader("operation", "push");
-		response.addHeader("policyId", policyName);
-		response.addHeader("groupId", pdpGroup);
-		return;*/
-	}
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java
deleted file mode 100644
index 8c88e68be..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/SafePolicyController.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.json.JSONObject;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.util.JsonMessage;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.RiskType;
-import org.openecomp.policy.rest.jpa.SafePolicyWarning;
-import org.openecomp.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.servlet.ModelAndView;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Controller
-public class SafePolicyController {
-
-	private static final Logger LOGGER  = FlexLogger.getLogger(SafePolicyController.class);
-	
-	private static CommonClassDao commonClassDao;
-	
-	@Autowired
-	public SafePolicyController(CommonClassDao commonClassDao){
-		SafePolicyController.commonClassDao = commonClassDao;
-	}
-	
-	public SafePolicyController(){}	
-	
-	public UserInfo getUserInfo(String loginId){
-		UserInfo name = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId", loginId);
-		return name;	
-	}
-	
-	private static String DUPLICATE = "Duplicate";
-
-	@RequestMapping(value = { "/get_RiskTypeDataByName" }, method = {
-			org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
-	public void getRiskTypeDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response) {
-		try {
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("riskTypeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(RiskType.class, "name")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		} catch (Exception e) {
-			LOGGER.error("Exception Occured"+e);
-		}
-	}
-
-	@RequestMapping(value = { "/get_RiskTypeData" }, method = {
-			org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
-	public void getEcompNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response) {
-		try {
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("riskTypeDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(RiskType.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-            response.addHeader("successMapKey", "success"); 
-            response.addHeader("operation", "getDictionary");
-			response.getWriter().write(j.toString());
-		} catch (Exception e) {
-            LOGGER.error(e.getMessage());
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-            response.addHeader("error", "dictionaryDBQuery");
-		}
-	}
-
-	@RequestMapping(value = { "/sp_dictionary/save_riskType" }, method = {
-			org.springframework.web.bind.annotation.RequestMethod.POST })
-	public ModelAndView saveRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-            RiskType riskTypeData;
-            String userId = null;
-            if (fromAPI) {
-                riskTypeData = (RiskType) mapper.readValue(root.get("dictionaryFields").toString(),
-                        RiskType.class);
-                userId = "API";
-                
-                //check if update operation or create, get id for data to be updated and update attributeData
-                if ("update".equalsIgnoreCase(request.getParameter("operation"))){
-                    List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(riskTypeData.getRiskName(), "name", RiskType.class);
-                    int id = 0;
-                    RiskType data = (RiskType) duplicateData.get(0);
-                    id = data.getId();
-                    
-                    if(id==0){
-                        isFakeUpdate=true;
-                        riskTypeData.setId(1);
-                    } else {
-                        riskTypeData.setId(id);
-                    }
-                    
-                    riskTypeData.setUserCreatedBy(this.getUserInfo(userId));
-                }
-            } else {
-            	riskTypeData = (RiskType) mapper.readValue(root.get("riskTypeDictionaryData").toString(), RiskType.class);
-            	userId = root.get("userid").textValue();
-            }
-			 
-			if (riskTypeData.getId() == 0) {
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(riskTypeData.getRiskName(), "name", RiskType.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					riskTypeData.setUserCreatedBy(getUserInfo(userId));
-					riskTypeData.setUserModifiedBy(getUserInfo(userId));
-					commonClassDao.save(riskTypeData);
-				}
-			} else {
-				if (!isFakeUpdate) {
-					riskTypeData.setUserModifiedBy(this.getUserInfo(userId));
-					riskTypeData.setModifiedDate(new Date());
-					commonClassDao.update(riskTypeData);
-				}
-			}
-            String responseString = "";
-            if(duplicateflag){
-                responseString = DUPLICATE;
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(RiskType.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("{riskTypeDictionaryDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
-        }catch (Exception e) {
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value = { "/sp_dictionary/remove_riskType" }, method = {
-			org.springframework.web.bind.annotation.RequestMethod.POST })
-	public ModelAndView removeEcompDictionary(HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		try {
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			RiskType ecompData = (RiskType) mapper.readValue(root.get("data").toString(), RiskType.class);
-			commonClassDao.delete(ecompData);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(RiskType.class));
-			JSONObject j = new JSONObject("{riskTypeDictionaryDatas: " + responseString + "}");
-			out.write(j.toString());
-
-			return null;
-		} catch (Exception e) {
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value = { "/get_SafePolicyWarningDataByName" }, method = {
-			org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
-	public void getSafePolicyWarningEntityDataByName(HttpServletRequest request, HttpServletResponse response) {
-		try {
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("safePolicyWarningDatas",
-					mapper.writeValueAsString(commonClassDao.getDataByColumn(SafePolicyWarning.class, "name")));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		} catch (Exception e) {
-			LOGGER.error("Exception Occured"+e);
-		}
-	}
-
-	@RequestMapping(value = { "/get_SafePolicyWarningData" }, method = {
-			org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
-	public void getSafePolicyWarningeEntityData(HttpServletRequest request, HttpServletResponse response) {
-		try {
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("safePolicyWarningDatas",
-					mapper.writeValueAsString(commonClassDao.getData(SafePolicyWarning.class)));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-            response.addHeader("successMapKey", "success"); 
-            response.addHeader("operation", "getDictionary");
-			response.getWriter().write(j.toString());
-		} catch (Exception e) {
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);                             
-            response.addHeader("error", "dictionaryDBQuery");
-            LOGGER.error(e.getMessage());
-		}
-	}
-
-	@RequestMapping(value = { "/sp_dictionary/save_safePolicyWarning" }, method = {
-			org.springframework.web.bind.annotation.RequestMethod.POST })
-	public ModelAndView saveSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		try {
-			boolean duplicateflag = false;
-            boolean isFakeUpdate = false;
-            boolean fromAPI = false;
-            if (request.getParameter("apiflag")!=null && request.getParameter("apiflag").equalsIgnoreCase("api")) {
-                fromAPI = true;
-            }
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			SafePolicyWarning safePolicyWarning;
-            if (fromAPI) {
-                safePolicyWarning = (SafePolicyWarning) mapper
-                        .readValue(root.get("dictionaryFields").toString(), SafePolicyWarning.class);
-                
-                //check if update operation or create, get id for data to be updated and update attributeData
-                if (request.getParameter("operation").equals("update")) {
-                    List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(safePolicyWarning.getName(), "name", SafePolicyWarning.class);
-                    int id = 0;
-                    SafePolicyWarning data = (SafePolicyWarning) duplicateData.get(0);
-                    id = data.getId();
-                    
-                    if(id==0){
-                        isFakeUpdate=true;
-                        safePolicyWarning.setId(1);
-                    } else {
-                        safePolicyWarning.setId(id);
-                    } 
-                }
-            } else {
-            	safePolicyWarning = (SafePolicyWarning) mapper.readValue(root.get("safePolicyWarningData").toString(), SafePolicyWarning.class);
-            }
-
-			if (safePolicyWarning.getId() == 0) {
-				List<Object> duplicateData =  commonClassDao.checkDuplicateEntry(safePolicyWarning.getName(), "name", SafePolicyWarning.class);
-				if(!duplicateData.isEmpty()){
-					duplicateflag = true;
-				}else{
-					commonClassDao.save(safePolicyWarning);
-				}
-			} else {
-				if(!isFakeUpdate) {
-					commonClassDao.update(safePolicyWarning);
-				}
-			}
-            String responseString = "";
-            if(duplicateflag){
-                responseString = DUPLICATE;
-            }else{
-                responseString = mapper.writeValueAsString(commonClassDao.getData(SafePolicyWarning.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("{safePolicyWarningDatas: " + responseString + "}");
-                out.write(j.toString());
-                return null;
-            }
- 
-        }catch (Exception e) {
-			response.setCharacterEncoding("UTF-8");
-			request.setCharacterEncoding("UTF-8");
-			PrintWriter out = response.getWriter();
-			out.write(e.getMessage());
-		}
-		return null;
-	}
-
-	@RequestMapping(value = { "/sp_dictionary/remove_SafePolicyWarning" }, method = {
-			org.springframework.web.bind.annotation.RequestMethod.POST })
-	public ModelAndView removeSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		try {
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			SafePolicyWarning safePolicyWarningData = (SafePolicyWarning) mapper.readValue(root.get("data").toString(),
-					SafePolicyWarning.class);
-			commonClassDao.delete(safePolicyWarningData);
-			response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-
-			PrintWriter out = response.getWriter();
-
-			String responseString = mapper.writeValueAsString(commonClassDao.getData(SafePolicyWarning.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;
-	}
-
-}
diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/package-info.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/package-info.java
deleted file mode 100644
index 049f3c72c..000000000
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/controller/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-
-package org.openecomp.policy.pap.xacml.rest.controller;