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=e965356befe1c71c396c5b4eaa100a43889ea908;hb=4068da123ee33b532b4b52f15545c76a978f977e;hp=1c873561fd4f086166b530be065458a59450f671;hpb=6f2b3f2dd0e80895acd0f77aa5784e717be33696;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 1c873561f..e965356be 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
@@ -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.
@@ -20,517 +20,455 @@
 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;
 
-import org.onap.policy.common.logging.flexlogger.FlexLogger;
-import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.pap.xacml.rest.controller.ActionPolicyDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.BRMSDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.ClosedLoopDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.DecisionPolicyDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.DescriptiveDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.DictionaryController;
-import org.onap.policy.pap.xacml.rest.controller.EnforcerDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.FirewallDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.MicroServiceDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.OptimizationDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.PolicyScopeDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.SafePolicyController;
-import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.ModelAndView;
 
 
 @Service("DictionaryService")
 public class DictionaryService {
-	
-	private static final Logger LOGGER	= FlexLogger.getLogger(DictionaryService.class);
-
-	/*
-	 * Methods that call the controller method directly to Save and Update dictionary data
-	 */
-	public String saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-		
-		DictionaryController dictionary = new DictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveOnapDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-		
-	}
-	
-	public String saveAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		DictionaryController dictionary = new DictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveAttributeDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-		
-		ActionPolicyDictionaryController action = new ActionPolicyDictionaryController();
-		String responseString = null;
-			ModelAndView result = action.saveActionPolicyDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException {
-		
-		BRMSDictionaryController dictionary = new BRMSDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveBRMSParamDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveVSCLAction(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveVSCLAction(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveVnfType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveVnfType(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String savePEPOptions(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.savePEPOptions(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveVarbind(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveVarbind(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveServiceType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveServiceType(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveSiteType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveSiteType(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveSettingsDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveDescriptiveDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveEnforcerDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveActionListDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveProtocolListDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveZoneDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveSecurityZoneDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String savePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.savePrefixListDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveAddressGroupDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveServiceGroupDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveServiceListDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveTermListDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	
-	
-	
-	public String saveMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveMicroServiceLocationDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveMicroServiceConfigNameDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveDCAEUUIDDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveMicroServiceModelsDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveMicroServiceAttributeDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.savePSServiceDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.savePSResourceDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.savePSTypeDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.savePSClosedLoopDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-		String responseString = null;
-			ModelAndView result = dictionary.savePSGroupScopeDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		
-		SafePolicyController dictionary = new SafePolicyController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveRiskTypeDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	public String saveSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		SafePolicyController dictionary = new SafePolicyController();
-		String responseString = null;
-			ModelAndView result = dictionary.saveSafePolicyWarningDictionary(request, response);
-			responseString = result.getViewName();
-		return responseString;
-	}
-	
-	
-	/*
-	 * Methods that call the controller get methods directly to get dictionary data
-	 */
-	public void getOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		DictionaryController dictionary = new DictionaryController();
-			dictionary.getOnapNameDictionaryEntityData(request, response);					
-	}
-	
-	public void getAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		DictionaryController dictionary = new DictionaryController();
-			dictionary.getAttributeDictionaryEntityData(request, response);
-	}
-	
-	public void getActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		ActionPolicyDictionaryController action = new ActionPolicyDictionaryController();
-			action.getActionPolicyDictionaryEntityData(request, response);	
-	}
-	
-	public void getBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		BRMSDictionaryController dictionary = new BRMSDictionaryController();
-			dictionary.getBRMSParamDictionaryEntityData(request, response);
-	}
-	
-	public void getVSCLAction(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-			dictionary.getVSCLActionDictionaryEntityData(request, response);
-	}
-	
-	public void getVnfType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-			dictionary.getVNFTypeDictionaryEntityData(request, response);
-	}
-	
-	public void getPEPOptions(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-			dictionary.getPEPOptionsDictionaryEntityData(request, response);
-	}
-	
-	public void getVarbind(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-			dictionary.getVarbindDictionaryEntityData(request, response);
-	}
-	
-	public void getServiceType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-			dictionary.getClosedLoopServiceDictionaryEntityData(request, response);
-	}
-	
-	public void getSiteType(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
-			dictionary.getClosedLoopSiteDictionaryEntityData(request, response);	
-	}
-	
-	public void getSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
-			dictionary.getSettingsDictionaryEntityData(request, response);
-	}
-	
-	public void getDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
-			dictionary.getDescriptiveDictionaryEntityData(request, response);
-	}
-	
-	public void getEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
-			dictionary.getEnforcerDictionaryEntityData(request, response);
-	}
-	
-	public void getActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getActionListDictionaryEntityData(request, response);
-	}
-	
-	public void getProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getProtocolListDictionaryEntityData(request, response);
-	}
-	
-	public void getZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getZoneDictionaryEntityData(request, response);
-	}
-	
-	public void getSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getSecurityZoneDictionaryEntityData(request, response);
-	}
-	
-	public void getPrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getPrefixListDictionaryEntityData(request, response);
-	}
-	
-	public void getAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getAddressGroupDictionaryEntityData(request, response);
-	}
-	
-	public void getServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getServiceGroupDictionaryEntityData(request, response);
-	}
-	
-	public void getServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getServiceListDictionaryEntityData(request, response);
-	}
-	
-	public void getTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		FirewallDictionaryController dictionary = new FirewallDictionaryController();
-			dictionary.getTermListDictionaryEntityData(request, response);
-	}
-	
-	
-	public void getMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-			dictionary.getMicroServiceLocationDictionaryEntityData(request, response);
-	}
-	
-	public void getMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-			dictionary.getMicroServiceConfigNameDictionaryEntityData(request, response);
-	}
-	
-	public void getDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-			dictionary.getDCAEUUIDDictionaryEntityData(request, response);
-	}
-	
-	public void getMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-			dictionary.getMicroServiceModelsDictionaryEntityData(request, response);
-	}
-	
-	public void getMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
-			dictionary.getMicroServiceModelsDictionaryEntityData(request, response);
-	}
-	
-	public void getPSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-			dictionary.getPSServiceEntityData(request, response);
-	}
-	
-	public void getPSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-			dictionary.getPSResourceEntityData(request, response);
-	}
-	
-	public void getPSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-			dictionary.getPSTypeEntityData(request, response);
-	}
-	
-	public void getPSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-			dictionary.getPSClosedLoopEntityData(request, response);
-	}
-	
-	public void getPSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
-			dictionary.getGroupPolicyScopeEntityData(request, response);
-	}
-	
-	public void getRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException, IOException{
-		SafePolicyController dictionary = new SafePolicyController();
-			dictionary.getOnapNameDictionaryEntityData(request, response);
-	}
-	
-	public void getSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response)  throws UnsupportedEncodingException, IOException{
-		SafePolicyController dictionary = new SafePolicyController();
-			dictionary.getSafePolicyWarningeEntityData(request, response);
-	}
+
+    /*
+     * Methods that call the controller method directly to Save and Update dictionary data
+     */
+    public String saveOnapDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        DictionaryController dictionary = new DictionaryController();
+            ModelAndView result = dictionary.saveOnapDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveAttributeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        DictionaryController dictionary = new DictionaryController();
+            ModelAndView result = dictionary.saveAttributeDictionary(request, response);
+        return result.getViewName();
+        }
+
+    public String saveActionPolicyDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        ActionPolicyDictionaryController action = new ActionPolicyDictionaryController();
+            ModelAndView result = action.saveActionPolicyDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveBRMSParamDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        BRMSDictionaryController dictionary = new BRMSDictionaryController();
+            ModelAndView result = dictionary.saveBRMSParamDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveVSCLAction(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            ModelAndView result = dictionary.saveVSCLAction(request, response);
+        return result.getViewName();
+    }
+
+    public String saveVnfType(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            ModelAndView result = dictionary.saveVnfType(request, response);
+        return result.getViewName();
+    }
+
+    public String savePEPOptions(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            ModelAndView result = dictionary.savePEPOptions(request, response);
+        return result.getViewName();
+    }
+
+    public String saveVarbind(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            ModelAndView result = dictionary.saveVarbind(request, response);
+        return result.getViewName();
+    }
+
+    public String saveServiceType(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            ModelAndView result = dictionary.saveServiceType(request, response);
+        return result.getViewName();
+    }
+
+    public String saveSiteType(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            ModelAndView result = dictionary.saveSiteType(request, response);
+        return result.getViewName();
+    }
+
+    public String saveSettingsDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
+            ModelAndView result = dictionary.saveSettingsDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveRainyDayDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
+            ModelAndView result = dictionary.saveRainyDayDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
+            ModelAndView result = dictionary.saveDescriptiveDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.saveActionListDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveProtocolListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.saveProtocolListDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.saveZoneDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveSecurityZoneDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.saveSecurityZoneDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String savePrefixListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.savePrefixListDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveAddressGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.saveAddressGroupDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveServiceGroupDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.saveServiceGroupDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveServiceListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.saveServiceListDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveTermListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            ModelAndView result = dictionary.saveTermListDictionary(request, response);
+        return result.getViewName();
+    }
+
+
+
+
+    public String saveMicroServiceLocationDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            ModelAndView result = dictionary.saveMicroServiceLocationDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveMicroServiceConfigNameDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            ModelAndView result = dictionary.saveMicroServiceConfigNameDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveDCAEUUIDDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            ModelAndView result = dictionary.saveDCAEUUIDDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveMicroServiceModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            ModelAndView result = dictionary.saveMicroServiceModelsDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveMicroServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            ModelAndView result = dictionary.saveMicroServiceAttributeDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveOptimizationModelsDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        OptimizationDictionaryController dictionary = new OptimizationDictionaryController();
+            ModelAndView result = dictionary.saveOptimizationModelsDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String savePSServiceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            ModelAndView result = dictionary.savePSServiceDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String savePSResourceDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            ModelAndView result = dictionary.savePSResourceDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String savePSTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            ModelAndView result = dictionary.savePSTypeDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String savePSClosedLoopDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            ModelAndView result = dictionary.savePSClosedLoopDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String savePSGroupScopeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            ModelAndView result = dictionary.savePSGroupScopeDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveRiskTypeDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+
+        SafePolicyController dictionary = new SafePolicyController();
+            ModelAndView result = dictionary.saveRiskTypeDictionary(request, response);
+        return result.getViewName();
+    }
+
+    public String saveSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+        SafePolicyController dictionary = new SafePolicyController();
+            ModelAndView result = dictionary.saveSafePolicyWarningDictionary(request, response);
+        return result.getViewName();
+    }
+
+
+    /*
+     * Methods that call the controller get methods directly to get dictionary data
+     */
+    public void getOnapDictionary(HttpServletResponse response){
+        DictionaryController dictionary = new DictionaryController();
+            dictionary.getOnapNameDictionaryEntityData(response);
+    }
+
+    public void getAttributeDictionary(HttpServletResponse response){
+        DictionaryController dictionary = new DictionaryController();
+            dictionary.getAttributeDictionaryEntityData(response);
+    }
+
+    public void getActionPolicyDictionary(HttpServletResponse response){
+        ActionPolicyDictionaryController action = new ActionPolicyDictionaryController();
+            action.getActionPolicyDictionaryEntityData(response);
+    }
+
+    public void getBRMSParamDictionary(HttpServletResponse response){
+        BRMSDictionaryController dictionary = new BRMSDictionaryController();
+            dictionary.getBRMSParamDictionaryEntityData(response);
+    }
+
+    public void getVSCLAction(HttpServletResponse response){
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            dictionary.getVSCLActionDictionaryEntityData(response);
+    }
+
+    public void getVnfType(HttpServletResponse response){
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            dictionary.getVNFTypeDictionaryEntityData(response);
+    }
+
+    public void getPEPOptions(HttpServletResponse response){
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            dictionary.getPEPOptionsDictionaryEntityData(response);
+    }
+
+    public void getVarbind(HttpServletResponse response){
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            dictionary.getVarbindDictionaryEntityData(response);
+    }
+
+    public void getServiceType(HttpServletResponse response){
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            dictionary.getClosedLoopServiceDictionaryEntityData(response);
+    }
+
+    public void getSiteType(HttpServletResponse response){
+        ClosedLoopDictionaryController dictionary = new ClosedLoopDictionaryController();
+            dictionary.getClosedLoopSiteDictionaryEntityData(response);
+    }
+
+    public void getSettingsDictionary(HttpServletResponse response){
+        DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
+            dictionary.getSettingsDictionaryEntityData(response);
+    }
+
+    public void getRainyDayDictionary(HttpServletResponse response){
+        DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
+            dictionary.getRainyDayDictionaryEntityData(response);
+    }
+
+    public void getDescriptiveDictionary(HttpServletResponse response){
+        DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
+            dictionary.getDescriptiveDictionaryEntityData(response);
+    }
+
+    public void getActionListDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getActionListDictionaryEntityData(response);
+    }
+
+    public void getProtocolListDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getProtocolListDictionaryEntityData(response);
+    }
+
+    public void getZoneDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getZoneDictionaryEntityData(response);
+    }
+
+    public void getSecurityZoneDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getSecurityZoneDictionaryEntityData(response);
+    }
+
+    public void getPrefixListDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getPrefixListDictionaryEntityData(response);
+    }
+
+    public void getAddressGroupDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getAddressGroupDictionaryEntityData(response);
+    }
+
+    public void getServiceGroupDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getServiceGroupDictionaryEntityData(response);
+    }
+
+    public void getServiceListDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getServiceListDictionaryEntityData(response);
+    }
+
+    public void getTermListDictionary(HttpServletResponse response){
+        FirewallDictionaryController dictionary = new FirewallDictionaryController();
+            dictionary.getTermListDictionaryEntityData(response);
+    }
+
+
+    public void getMicroServiceLocationDictionary(HttpServletResponse response){
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            dictionary.getMicroServiceLocationDictionaryEntityData(response);
+    }
+
+    public void getMicroServiceConfigNameDictionary(HttpServletResponse response){
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            dictionary.getMicroServiceConfigNameDictionaryEntityData(response);
+    }
+
+    public void getDCAEUUIDDictionary(HttpServletResponse response){
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            dictionary.getDCAEUUIDDictionaryEntityData(response);
+    }
+
+    public void getMicroServiceModelsDictionary(HttpServletResponse response){
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            dictionary.getMicroServiceModelsDictionaryEntityData(response);
+    }
+
+    public void getMicroServiceDictionary(HttpServletResponse response){
+        MicroServiceDictionaryController dictionary = new MicroServiceDictionaryController();
+            dictionary.getMicroServiceModelsDictionaryEntityData(response);
+    }
+
+    public void getOptimizationModelsDictionary(HttpServletResponse response){
+        OptimizationDictionaryController dictionary = new OptimizationDictionaryController();
+            dictionary.getOptimizationModelsDictionaryEntityData(response);
+    }
+
+    public void getPSServiceDictionary(HttpServletResponse response){
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            dictionary.getPSServiceEntityData(response);
+    }
+
+    public void getPSResourceDictionary(HttpServletResponse response){
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            dictionary.getPSResourceEntityData(response);
+    }
+
+    public void getPSTypeDictionary(HttpServletResponse response){
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            dictionary.getPSTypeEntityData(response);
+    }
+
+    public void getPSClosedLoopDictionary(HttpServletResponse response){
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            dictionary.getPSClosedLoopEntityData(response);
+    }
+
+    public void getPSGroupScopeDictionary(HttpServletResponse response){
+        PolicyScopeDictionaryController dictionary = new PolicyScopeDictionaryController();
+            dictionary.getGroupPolicyScopeEntityData(response);
+    }
+
+    public void getRiskTypeDictionary(HttpServletResponse response){
+        SafePolicyController dictionary = new SafePolicyController();
+            dictionary.getRiskTypeDictionaryEntityData(response);
+    }
+
+    public void getSafePolicyWarningDictionary(HttpServletResponse response) {
+        SafePolicyController dictionary = new SafePolicyController();
+            dictionary.getSafePolicyWarningeEntityData(response);
+    }
 }
\ No newline at end of file