X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FDictionaryController.java;h=72539880cd83f4fe3547f7c3855f98d1018c9585;hb=f0fec2a861ea0a92b27b40882ea38f9422cde0c6;hp=db6acc82c798150cf01a27c4247228fb8bc69734;hpb=6f2b3f2dd0e80895acd0f77aa5784e717be33696;p=policy%2Fengine.git diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java index db6acc82c..72539880c 100644 --- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java +++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-PAP-REST * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,29 +21,19 @@ package org.onap.policy.pap.xacml.rest.controller; import java.io.IOException; -import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; import java.util.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.onap.policy.pap.xacml.rest.util.JsonMessage; +import org.onap.policy.pap.xacml.rest.util.DictionaryUtils; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.Attribute; -import org.onap.policy.rest.jpa.Category; -import org.onap.policy.rest.jpa.Datatype; import org.onap.policy.rest.jpa.OnapName; import org.onap.policy.rest.jpa.UserInfo; -import org.onap.policy.xacml.api.XACMLErrorConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -57,393 +47,201 @@ 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 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 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 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 UnsupportedEncodingException, IOException{ - 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()); + private static final Log LOGGER = LogFactory.getLog(DictionaryController.class); + + private static CommonClassDao commonClassDao; + private static String xacmlId = "xacmlId"; + private static String operation = "operation"; + private static String dictionaryFields ="dictionaryFields"; + private static String duplicateResponseString = "Duplicate"; + private static String onapName = "onapName"; + private static String attributeDatas = "attributeDictionaryDatas"; + private static String onapNameDatas = "onapNameDictionaryDatas"; + + @Autowired + public DictionaryController(CommonClassDao commonClassDao){ + DictionaryController.commonClassDao = commonClassDao; + } + + public DictionaryController(){ + super(); + } + + private DictionaryUtils getDictionaryUtilsInstance(){ + return DictionaryUtils.getDictionaryUtils(); + } + + @RequestMapping(value={"/get_AttributeDatabyAttributeName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + public void getAttributeDictionaryEntityDatabyAttributeName(HttpServletResponse response){ + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getDataByEntity(response, attributeDatas, xacmlId, Attribute.class); + } + + //Attribute Dictionary + @RequestMapping(value="/get_AttributeData", method= RequestMethod.GET , produces=MediaType.APPLICATION_JSON_VALUE) + public void getAttributeDictionaryEntityData(HttpServletResponse response){ + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getData(response, attributeDatas, Attribute.class); + } + + @RequestMapping(value={"/attribute_dictionary/save_attribute"}, method={RequestMethod.POST}) + public ModelAndView saveAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{ + DictionaryUtils utils = getDictionaryUtilsInstance(); + try { + boolean fromAPI = utils.isRequestFromAPI(request); + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + JsonNode root = mapper.readTree(request.getReader()); 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); + if(fromAPI){ + attributeData = mapper.readValue(root.get(dictionaryFields).toString(), Attribute.class); + attributeValueData = 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 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 = mapper.readValue(root.get("attributeDictionaryData").toString(), Attribute.class); + attributeValueData = mapper.readValue(root.get("attributeDictionaryData").toString(), AttributeValues.class); + userId = root.get("userid").textValue(); + } + UserInfo userInfo = utils.getUserInfo(userId); + List duplicateData = commonClassDao.checkDuplicateEntry(attributeData.getXacmlId(), xacmlId, Attribute.class); + boolean duplicateflag = false; + if(!duplicateData.isEmpty()){ + Attribute data = (Attribute) duplicateData.get(0); + if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){ + attributeData.setId(data.getId()); + }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || + (request.getParameter(operation) == null && (data.getId() != attributeData.getId()))){ + duplicateflag = true; } - } 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 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); - } - } + if(attributeValueData.getUserDataTypeValues() != null && !attributeValueData.getUserDataTypeValues().isEmpty()){ + attributeData.setAttributeValue(utils.appendKey(attributeValueData.getUserDataTypeValues(), "attributeValues", ",")); + } + + if(attributeData.getDatatypeBean().getShortName() != null){ + String datatype = attributeData.getDatatypeBean().getShortName(); + attributeData.setDatatypeBean(utils.getDataType(datatype)); + } + String responseString = null; - if(duplicateflag) { - responseString = "Duplicate"; - } else { + if(!duplicateflag){ + attributeData.setUserModifiedBy(userInfo); + if(attributeData.getId() == 0){ + attributeData.setCategoryBean(utils.getCategory()); + attributeData.setUserCreatedBy(userInfo); + commonClassDao.save(attributeData); + }else{ + attributeData.setModifiedDate(new Date()); + commonClassDao.update(attributeData); + } responseString = mapper.writeValueAsString(commonClassDao.getData(Attribute.class)); + }else{ + responseString = duplicateResponseString; + } + if(fromAPI){ + return utils.getResultForApi(responseString); + }else{ + utils.setResponseData(response, attributeDatas, responseString); + } + }catch (Exception e){ + utils.setErrorResponseData(response, e); + } + return null; + } + + @RequestMapping(value={"/attribute_dictionary/remove_attribute"}, method={RequestMethod.POST}) + public void removeAttributeDictionary(HttpServletRequest request, HttpServletResponse response)throws IOException { + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.removeData(request, response, attributeDatas, Attribute.class); + } + + //OnapName Dictionary + @RequestMapping(value={"/get_OnapNameDataByName"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + public void getOnapNameDictionaryByNameEntityData(HttpServletResponse response){ + LOGGER.info("get_OnapNameDataByName is called"); + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getDataByEntity(response, onapNameDatas, onapName, OnapName.class); + } + + @RequestMapping(value={"/get_OnapNameData"}, method={RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) + public void getOnapNameDictionaryEntityData(HttpServletResponse response){ + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.getData(response, onapNameDatas, OnapName.class); + } + + @RequestMapping(value={"/onap_dictionary/save_onapName"}, method={RequestMethod.POST}) + public ModelAndView saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{ + DictionaryUtils utils = getDictionaryUtilsInstance(); + try { + boolean fromAPI = utils.isRequestFromAPI(request); + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + JsonNode root = mapper.readTree(request.getReader()); + OnapName onapData; + String userId = null; + if(fromAPI){ + onapData = mapper.readValue(root.get(dictionaryFields).toString(), OnapName.class); + userId = "API"; + }else{ + onapData = mapper.readValue(root.get("onapNameDictionaryData").toString(), OnapName.class); + userId = root.get("userid").textValue(); + } + UserInfo userInfo = utils.getUserInfo(userId); + + List duplicateData = commonClassDao.checkDuplicateEntry(onapData.getOnapName(), onapName, OnapName.class); + boolean duplicateflag = false; + if(!duplicateData.isEmpty()){ + OnapName data = (OnapName) duplicateData.get(0); + if(request.getParameter(operation) != null && "update".equals(request.getParameter(operation))){ + onapData.setId(data.getId()); + }else if((request.getParameter(operation) != null && !"update".equals(request.getParameter(operation))) || + (request.getParameter(operation) == null && (data.getId() != onapData.getId()))){ + duplicateflag = true; + } } - - if (fromAPI) { - if (responseString!=null && !responseString.equals("Duplicate")) { - if(isFakeUpdate) { - responseString = "Exists"; - } else { - responseString = "Success"; - } + String responseString = null; + if(!duplicateflag){ + onapData.setUserModifiedBy(userInfo); + if(onapData.getId() == 0){ + onapData.setUserCreatedBy(userInfo); + commonClassDao.save(onapData); + }else{ + onapData.setModifiedDate(new Date()); + commonClassDao.update(onapData); } - 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; + responseString = mapper.writeValueAsString(commonClassDao.getData(OnapName.class)); + }else{ + responseString = duplicateResponseString; + } + if(fromAPI){ + return utils.getResultForApi(responseString); + }else{ + utils.setResponseData(response, onapNameDatas, responseString); } }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 UnsupportedEncodingException, IOException { - 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; - } - - //OnapName Dictionary - @RequestMapping(value={"/get_OnapNameDataByName"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) - public void getOnapNameDictionaryByNameEntityData(HttpServletRequest request, HttpServletResponse response){ - LOGGER.info("get_OnapNameDataByName is called"); - try{ - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("onapNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getDataByColumn(OnapName.class, "onapName"))); - 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_OnapNameData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) - public void getOnapNameDictionaryEntityData(HttpServletRequest request, HttpServletResponse response){ - try{ - Map model = new HashMap<>(); - ObjectMapper mapper = new ObjectMapper(); - model.put("onapNameDictionaryDatas", mapper.writeValueAsString(commonClassDao.getData(OnapName.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={"/onap_dictionary/save_onapName"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public ModelAndView saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{ - 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()); - OnapName onapData; - String userId = null; - if (fromAPI) { - onapData = (OnapName)mapper.readValue(root.get("dictionaryFields").toString(), OnapName.class); - userId = "API"; - - //check if update operation or create, get id for data to be updated - if (request.getParameter("operation").equals("update")) { - List duplicateData = commonClassDao.checkDuplicateEntry(onapData.getOnapName(), "onapName", OnapName.class); - int id = 0; - OnapName data = (OnapName) duplicateData.get(0); - id = data.getId(); - if(id==0){ - isFakeUpdate=true; - onapData.setId(1); - } else { - onapData.setId(id); - } - onapData.setUserCreatedBy(this.getUserInfo(userId)); - } - } else { - onapData = (OnapName)mapper.readValue(root.get("onapNameDictionaryData").toString(), OnapName.class); - userId = root.get("userid").textValue(); - } - if(onapData.getId() == 0){ - List duplicateData = commonClassDao.checkDuplicateEntry(onapData.getOnapName(), "onapName", OnapName.class); - if(!duplicateData.isEmpty()){ - duplicateflag = true; - }else{ - onapData.setUserCreatedBy(getUserInfo(userId)); - onapData.setUserModifiedBy(getUserInfo(userId)); - commonClassDao.save(onapData); - } - }else{ - if(!isFakeUpdate){ - onapData.setUserModifiedBy(this.getUserInfo(userId)); - onapData.setModifiedDate(new Date()); - commonClassDao.update(onapData); - } - } - String responseString = null; - if(duplicateflag) { - responseString = "Duplicate"; - } else { - responseString = mapper.writeValueAsString(commonClassDao.getData(OnapName.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("{onapNameDictionaryDatas: " + 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={"/onap_dictionary/remove_onap"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public ModelAndView removeOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException { - try{ - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - JsonNode root = mapper.readTree(request.getReader()); - OnapName onapData = (OnapName)mapper.readValue(root.get("data").toString(), OnapName.class); - commonClassDao.delete(onapData); - response.setCharacterEncoding("UTF-8"); - response.setContentType("application / json"); - request.setCharacterEncoding("UTF-8"); - - PrintWriter out = response.getWriter(); - - String responseString = mapper.writeValueAsString(commonClassDao.getData(OnapName.class)); - JSONObject j = new JSONObject("{onapNameDictionaryDatas: " + 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; - } - + utils.setErrorResponseData(response, e); + } + return null; + } + + @RequestMapping(value={"/onap_dictionary/remove_onap"}, method={RequestMethod.POST}) + public void removeOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException { + DictionaryUtils utils = getDictionaryUtilsInstance(); + utils.removeData(request, response, onapNameDatas, OnapName.class); + } } class AttributeValues{ - private ArrayList userDataTypeValues; - - public ArrayList getUserDataTypeValues() { - return userDataTypeValues; - } + private List userDataTypeValues; - public void setUserDataTypeValues(ArrayList userDataTypeValues) { - this.userDataTypeValues = userDataTypeValues; - } -} + public List getUserDataTypeValues() { + return userDataTypeValues; + } + public void setUserDataTypeValues(List userDataTypeValues) { + this.userDataTypeValues = userDataTypeValues; + } +} \ No newline at end of file