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=00ae10fb680e423af8e7abfd2b040401afa6f947;hb=ef9258807505ff24e8221bae25d06ab65029397c;hp=6e19b9b1c5351dde87cb4ef321bc6bd6a2cb873d;hpb=deb35bccd7b0d360668f393fe5b45b735b7956b2;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 6e19b9b1c..00ae10fb6 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.
@@ -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;
@@ -135,13 +135,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();
@@ -360,11 +353,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);
@@ -463,10 +451,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);
 	}