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%2Fservice%2FDictionaryService.java;h=1c873561fd4f086166b530be065458a59450f671;hb=7925630b5edc79119f29392edc6ddc84cf7c3757;hp=df1916be9f953432c88ae3a02f208119a1812094;hpb=c53fa990ea27ec074859eb94bcb7ec6deaa2157b;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java
index df1916be9..1c873561f 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/DictionaryService.java
@@ -19,6 +19,8 @@
  */
 package org.onap.policy.pap.xacml.rest.service;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -48,541 +50,312 @@ public class DictionaryService {
 	/*
 	 * Methods that call the controller method directly to Save and Update dictionary data
 	 */
-	public String saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
 		
 		DictionaryController dictionary = new DictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveOnapDictionary(request, response);
 			responseString = result.getViewName();
-			
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 		
 	}
 	
-	public String saveAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		DictionaryController dictionary = new DictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveAttributeDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
 		
 		ActionPolicyDictionaryController action = new ActionPolicyDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = action.saveActionPolicyDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
 		
 		BRMSDictionaryController dictionary = new BRMSDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveBRMSParamDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String saveVSCLAction(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveVSCLAction(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveVSCLAction(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String saveVnfType(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveVnfType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveVnfType(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String savePEPOptions(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String savePEPOptions(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.savePEPOptions(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String saveVarbind(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveVarbind(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveVarbind(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String saveServiceType(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveServiceType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveServiceType(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String saveSiteType(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveSiteType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveSiteType(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-		}
-		
 		return responseString;
 	}
 	
-	public String saveSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveSettingsDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveDescriptiveDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveEnforcerDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveActionListDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveProtocolListDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveZoneDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveSecurityZoneDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String savePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String savePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.savePrefixListDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveAddressGroupDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveServiceGroupDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveServiceListDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveTermListDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
 	
 	
 	
-	public String saveMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveMicroServiceLocationDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveMicroServiceConfigNameDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveDCAEUUIDDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveMicroServiceModelsDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveMicroServiceAttributeDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.savePSServiceDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.savePSResourceDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.savePSTypeDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.savePSClosedLoopDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.savePSGroupScopeDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
+	public String saveRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		
 		SafePolicyController dictionary = new SafePolicyController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveRiskTypeDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
-	public String saveSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public String saveSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		SafePolicyController dictionary = new SafePolicyController();
 		String responseString = null;
-		try {
 			ModelAndView result = dictionary.saveSafePolicyWarningDictionary(request, response);
 			responseString = result.getViewName();
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 		return responseString;
 	}
 	
@@ -590,406 +363,174 @@ public class DictionaryService {
 	/*
 	 * Methods that call the controller get methods directly to get dictionary data
 	 */
-	public void getOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		DictionaryController dictionary = new DictionaryController();
-		try {
 			dictionary.getOnapNameDictionaryEntityData(request, response);					
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}		
 	}
 	
-	public void getAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		DictionaryController dictionary = new DictionaryController();
-		try {
 			dictionary.getAttributeDictionaryEntityData(request, response);
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		ActionPolicyDictionaryController action = new ActionPolicyDictionaryController();
-		try {
 			action.getActionPolicyDictionaryEntityData(request, response);	
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		BRMSDictionaryController dictionary = new BRMSDictionaryController();
-		try {
 			dictionary.getBRMSParamDictionaryEntityData(request, response);
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 	}
 	
-	public void getVSCLAction(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getVSCLAction(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		try {
 			dictionary.getVSCLActionDictionaryEntityData(request, response);
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getVnfType(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getVnfType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		try {
 			dictionary.getVNFTypeDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 	}
 	
-	public void getPEPOptions(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getPEPOptions(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		try {
 			dictionary.getPEPOptionsDictionaryEntityData(request, response);
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getVarbind(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getVarbind(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		try {
 			dictionary.getVarbindDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
-		
 	}
 	
-	public void getServiceType(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getServiceType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		try {
 			dictionary.getClosedLoopServiceDictionaryEntityData(request, response);
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getSiteType(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getSiteType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		try {
 			dictionary.getClosedLoopSiteDictionaryEntityData(request, response);	
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
-		try {
 			dictionary.getSettingsDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}		
 	}
 	
-	public void getDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
-		try {
 			dictionary.getDescriptiveDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			
-		}
 	}
 	
-	public void getEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
-		try {
 			dictionary.getEnforcerDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getActionListDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getProtocolListDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getZoneDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getSecurityZoneDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getPrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getPrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getPrefixListDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getAddressGroupDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getServiceGroupDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getServiceListDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		try {
 			dictionary.getTermListDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
 	
-	public void getMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		try {
 			dictionary.getMicroServiceLocationDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		try {
 			dictionary.getMicroServiceConfigNameDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		try {
 			dictionary.getDCAEUUIDDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		try {
 			dictionary.getMicroServiceModelsDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		try {
 			dictionary.getMicroServiceModelsDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getPSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getPSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		try {
 			dictionary.getPSServiceEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getPSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getPSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		try {
 			dictionary.getPSResourceEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getPSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getPSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		try {
 			dictionary.getPSTypeEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getPSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getPSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		try {
 			dictionary.getPSClosedLoopEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getPSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getPSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		try {
 			dictionary.getGroupPolicyScopeEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
 		SafePolicyController dictionary = new SafePolicyController();
-		try {
 			dictionary.getOnapNameDictionaryEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 	
-	public void getSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws Exception{
-		
+	public void getSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response)  throws UnsupportedEncodingException, IOException{
 		SafePolicyController dictionary = new SafePolicyController();
-		try {
 			dictionary.getSafePolicyWarningeEntityData(request, response);
-		
-		} catch (Exception e) {
-			LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + e);
-			
-		}
 	}
 }
\ No newline at end of file