Added Junits for ONAP-PAP-REST

[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 5b2fc4c..20bd946 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,13 +23,13 @@ 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.PolicyScopeDictionaryController;
@@ -121,17 +121,17 @@ public class DictionaryService {
                return result.getViewName();
        }
        
-       public String saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+       public String saveRainyDayDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
                
-               DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
-                       ModelAndView result = dictionary.saveDescriptiveDictionary(request, response);
+               DecisionPolicyDictionaryController dictionary = new DecisionPolicyDictionaryController();
+                       ModelAndView result = dictionary.saveRainyDayDictionary(request, response);
                return result.getViewName();
        }
        
-       public String saveEnforcerDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
+       public String saveDescriptiveDictionary(HttpServletRequest request, HttpServletResponse response) throws IOException{
                
-               EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
-                       ModelAndView result = dictionary.saveEnforcerDictionary(request, response);
+               DescriptiveDictionaryController dictionary = new DescriptiveDictionaryController();
+                       ModelAndView result = dictionary.saveDescriptiveDictionary(request, response);
                return result.getViewName();
        }
        
@@ -343,16 +343,16 @@ public class DictionaryService {
                        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 getEnforcerDictionary(HttpServletResponse response){
-               EnforcerDictionaryController dictionary = new EnforcerDictionaryController();
-                       dictionary.getEnforcerDictionaryEntityData(response);
-       }
-       
        public void getActionListDictionary(HttpServletResponse response){
                FirewallDictionaryController dictionary = new FirewallDictionaryController();
                        dictionary.getActionListDictionaryEntityData(response);