diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2018-01-03 16:35:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-01-03 16:35:39 +0000 |
commit | 84dfe2ecbdb18041ddfc49ac0beeb650238ff37c (patch) | |
tree | 233e2676cb42534976fe7eefda8ced6aeb563cad /POLICY-SDK-APP | |
parent | 85e767c65b23a1fef35e5a0199a57bf755070815 (diff) | |
parent | 82e81ac60d97b93847a26accc071e7043d831ab0 (diff) |
Merge "Adding SONAR fixes for"
Diffstat (limited to 'POLICY-SDK-APP')
-rw-r--r-- | POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java | 2 | ||||
-rw-r--r-- | POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java index cb373a1bd..151d36a33 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java @@ -1448,7 +1448,7 @@ public class PolicyManagerServlet extends HttpServlet { policyAdapter.setReadOnly(false); policyAdapter.setEditPolicy(true); } - policyAdapter.setDomain(domain); + policyAdapter.setDomainDir(domain); policyAdapter.setPolicyData(policy); String policyName = path.replace(".xml", ""); diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java index 9a1aac1b5..ed32f2904 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyValidationController.java @@ -46,14 +46,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class PolicyValidationController extends RestrictedBaseController { private static final Logger LOGGER = FlexLogger.getLogger(PolicyValidationController.class); - - public static final String CONFIG_POLICY = "Config"; - public static final String ACTION_POLICY = "Action"; - public static final String DECISION_POLICY = "Decision"; - public static final String CLOSEDLOOP_POLICY = "ClosedLoop_Fault"; - public static final String CLOSEDLOOP_PM = "ClosedLoop_PM"; - public static final String ENFORCER_CONFIG_POLICY= "Enforcer Config"; - public static final String MICROSERVICES="Micro Service"; @RequestMapping(value={"/policyController/validate_policy.htm"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) public ModelAndView validatePolicy(HttpServletRequest request, HttpServletResponse response) throws IOException{ |