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%2Fhandler%2FDictionaryHandlerImpl.java;h=d0cd985a3768f90de9fba4e9882ee4becc86d2f0;hb=b6d9063e06ab8cdf2d97fc75810792659344e4a8;hp=e0304d079e36eb0fc3241063d333db21675efa66;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
index e0304d079..d0cd985a3 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.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.
@@ -37,109 +37,112 @@ public class DictionaryHandlerImpl implements DictionaryHandler{
 			DictionaryService dictionary = new DictionaryService();
 			switch (dictionaryType) {
 			case "OnapName":
-				dictionary.getOnapDictionary(request, response);
+				dictionary.getOnapDictionary(response);
 				break;
 			case "Attribute":
-				dictionary.getAttributeDictionary(request, response);
+				dictionary.getAttributeDictionary(response);
 				break;
 			case "Action":
-				dictionary.getActionPolicyDictionary(request, response);
+				dictionary.getActionPolicyDictionary(response);
 				break;
 			case "BRMSParamTemplate":
-				dictionary.getBRMSParamDictionary(request, response);
+				dictionary.getBRMSParamDictionary(response);
 				break;
 			case "VSCLAction":
-				dictionary.getVSCLAction(request, response);
+				dictionary.getVSCLAction(response);
 				break;
 			case "VNFType":
-				dictionary.getVnfType(request, response);
+				dictionary.getVnfType(response);
 				break;
 			case "PEPOptions":
-				dictionary.getPEPOptions(request, response);
+				dictionary.getPEPOptions(response);
 				break;
 			case "Varbind":
-				dictionary.getVarbind(request, response);
+				dictionary.getVarbind(response);
 				break;
 			case "Service":
-				dictionary.getServiceType(request, response);
+				dictionary.getServiceType(response);
 				break;
 			case "Site":
-				dictionary.getSiteType(request, response);
+				dictionary.getSiteType(response);
 				break;
 			case "Settings":
-				dictionary.getSettingsDictionary(request, response);
+				dictionary.getSettingsDictionary(response);
 				break;
-			case "DescriptiveScope":
-				dictionary.getDescriptiveDictionary(request, response);
+			case "RainyDayTreatments":
+				dictionary.getRainyDayDictionary(response);
 				break;
-			case "Enforcer":
-				dictionary.getEnforcerDictionary(request, response);
+			case "DescriptiveScope":
+				dictionary.getDescriptiveDictionary(response);
 				break;
 			case "ActionList":
-				dictionary.getActionListDictionary(request, response);
+				dictionary.getActionListDictionary(response);
 				break;
 			case "ProtocolList":
-				dictionary.getProtocolListDictionary(request, response);
+				dictionary.getProtocolListDictionary(response);
 				break;
 			case "Zone":
-				dictionary.getZoneDictionary(request, response);
+				dictionary.getZoneDictionary(response);
 				break;
 			case "SecurityZone":
-				dictionary.getSecurityZoneDictionary(request, response);
+				dictionary.getSecurityZoneDictionary(response);
 				break;
 			case "PrefixList":
-				dictionary.getPrefixListDictionary(request, response);
+				dictionary.getPrefixListDictionary(response);
 				break;
 			case "AddressGroup":
-				dictionary.getAddressGroupDictionary(request, response);
+				dictionary.getAddressGroupDictionary(response);
 				break;
 			case "ServiceGroup":
-				dictionary.getServiceGroupDictionary(request, response);
+				dictionary.getServiceGroupDictionary(response);
 				break;
 			case "ServiceList":
-				dictionary.getServiceListDictionary(request, response);
+				dictionary.getServiceListDictionary(response);
 				break;
 			case "TermList":
 			case "RuleList":
 			case "FirewallRuleList":
 			case "Term":
-				dictionary.getTermListDictionary(request, response);
+				dictionary.getTermListDictionary(response);
 				break;
 			case "MicroServiceLocation":
-				dictionary.getMicroServiceLocationDictionary(request, response);
+				dictionary.getMicroServiceLocationDictionary(response);
 				break;
 			case "MicroServiceConfigName":
-				dictionary.getMicroServiceConfigNameDictionary(request, response);
+				dictionary.getMicroServiceConfigNameDictionary(response);
 				break;
 			case "DCAEUUID":
-				dictionary.getDCAEUUIDDictionary(request, response);
+				dictionary.getDCAEUUIDDictionary(response);
 				break;
 			case "MicroServiceModels":
-				dictionary.getMicroServiceModelsDictionary(request, response);
+				dictionary.getMicroServiceModelsDictionary(response);
+				break;
+			case "MicroServiceDictionary":
+				dictionary.getMicroServiceDictionary(response);
+				break;
+			case "OptimizationModels":
+				dictionary.getOptimizationModelsDictionary(response);
 				break;
 			case "PolicyScopeService":
-				dictionary.getPSServiceDictionary(request, response);
+				dictionary.getPSServiceDictionary(response);
 				break;
 			case "PolicyScopeResource":
-				dictionary.getPSResourceDictionary(request, response);
+				dictionary.getPSResourceDictionary(response);
 				break;
 			case "PolicyScopeType":
-				dictionary.getPSTypeDictionary(request, response);
+				dictionary.getPSTypeDictionary(response);
 				break;
 			case "PolicyScopeClosedLoop":
-				dictionary.getPSClosedLoopDictionary(request, response);
+				dictionary.getPSClosedLoopDictionary(response);
 				break;
 			case "GroupPolicyScopeList":
-				dictionary.getPSGroupScopeDictionary(request, response);
+				dictionary.getPSGroupScopeDictionary(response);
 				break;
 			case "RiskType":
-				dictionary.getRiskTypeDictionary(request, response);
+				dictionary.getRiskTypeDictionary(response);
 				break;
 			case "SafePolicyWarning":
-				dictionary.getSafePolicyWarningDictionary(request, response);
-				break;
-			case "MicroServiceDictionary":
-				dictionary.getMicroServiceDictionary(request, response);
+				dictionary.getSafePolicyWarningDictionary(response);
 				break;
 			default:
 				extendedOptions(dictionaryType, request, response, true);
@@ -212,12 +215,12 @@ public class DictionaryHandlerImpl implements DictionaryHandler{
 			case "Settings":
 				result = dictionary.saveSettingsDictionary(request, response);
 				break;
+			case "RainyDayTreatments":
+				result = dictionary.saveRainyDayDictionary(request, response);
+				break;
 			case "DescriptiveScope":
 				result = dictionary.saveDescriptiveDictionary(request, response);
 				break;
-			case "Enforcer":
-				result = dictionary.saveEnforcerDictionary(request, response);
-				break;
 			case "ActionList":
 				result = dictionary.saveActionListDictionary(request, response);
 				break;
@@ -260,6 +263,12 @@ public class DictionaryHandlerImpl implements DictionaryHandler{
 			case "MicroServiceModels":
 				result = dictionary.saveMicroServiceModelsDictionary(request, response);
 				break;
+			case "MicroServiceDictionary":
+				result = dictionary.saveMicroServiceDictionary(request, response);
+				break;
+			case "OptimizationModels":
+				result = dictionary.saveOptimizationModelsDictionary(request, response);
+				break;
 			case "PolicyScopeService":
 				result = dictionary.savePSServiceDictionary(request, response);
 				break;
@@ -281,9 +290,6 @@ public class DictionaryHandlerImpl implements DictionaryHandler{
 			case "SafePolicyWarning":
 				result = dictionary.saveSafePolicyWarningDictionary(request, response);
 				break;
-			case "MicroServiceDictionary":
-				result = dictionary.saveMicroServiceDictionary(request, response);
-				break;
 			default:
 				result = extendedOptions(dictionaryType, request, response, false);
 				if(result==null){