New Optimization Policy

[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / service / DictionaryService.java

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 6e19b9b..cb03d44 100644 (file)
--- 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.
@@ -23,15 +23,16 @@ import java.io.IOException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 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.springframework.stereotype.Service;
@@ -135,13 +136,6 @@ public class DictionaryService {
                return result.getViewName();
        }
        
-       public String saveEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
-               
-               EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
-                       ModelAndView result = dictionary.saveEnforcerDictionary(request, response);
-               return result.getViewName();
-       }
-       
        public String saveActionListDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
                
                FirewallDictionaryController dictionary = new FirewallDictionaryController();
@@ -243,6 +237,13 @@ public class DictionaryService {
                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();
@@ -360,11 +361,6 @@ public class DictionaryService {
                        dictionary.getDescriptiveDictionaryEntityData(response);
        }
        
-       public void getEnforcerDictionary(HttpServletResponse response){
-               EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
-                       dictionary.getEnforcerDictionaryEntityData(response);
-       }
-       
        public void getActionListDictionary(HttpServletResponse response){
                FirewallDictionaryController dictionary = new FirewallDictionaryController();
                        dictionary.getActionListDictionaryEntityData(response);
@@ -436,6 +432,11 @@ public class DictionaryService {
                        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);
@@ -463,10 +464,10 @@ public class DictionaryService {
        
        public void getRiskTypeDictionary(HttpServletResponse response){
                SafePolicyController dictionary = new SafePolicyController();
-                       dictionary.getOnapNameDictionaryEntityData(response);
+                       dictionary.getRiskTypeDictionaryEntityData(response);
        }
        
-       public void getSafePolicyWarningDictionary(HttpServletRequest request, HttpServletResponse response) {
+       public void getSafePolicyWarningDictionary(HttpServletResponse response) {
                SafePolicyController dictionary = new SafePolicyController();
                        dictionary.getSafePolicyWarningeEntityData(response);
        }