fix typo that can lead on bugs 78/83978/3
authorMatthieu Cauffiez <matthieu.cauffiez@bell.ca>
Mon, 1 Apr 2019 19:40:00 +0000 (15:40 -0400)
committerPamela Dragosh <pdragosh@research.att.com>
Tue, 9 Apr 2019 13:00:57 +0000 (13:00 +0000)
string xacmlId doesn t correspond to
anything in DecisionSettings
same for shotname in functionDefinition

Issue-ID: POLICY-1250
Change-Id: I7ac457666f341b50c761dbdabf806fa7efece5a9
Signed-off-by: Matthieu Cauffiez <matthieu.cauffiez@bell.ca>
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicy.java

index 3a18504..a254f7a 100644 (file)
@@ -457,7 +457,7 @@ public class DecisionPolicy extends Policy {
     }
 
     private DecisionSettings findDecisionSettingsBySettingId(String settingId) {
-        return (DecisionSettings) commonClassDao.getEntityItem(DecisionSettings.class, "xacmlId", settingId);
+        return (DecisionSettings) commonClassDao.getEntityItem(DecisionSettings.class, "xacml_id", settingId);
     }
 
     private void createRule(PolicyType decisionPolicy, boolean permitRule) {
@@ -873,7 +873,7 @@ public class DecisionPolicy extends Policy {
 
     public String getFunctionDefinitionId(String key) {
         FunctionDefinition object =
-                (FunctionDefinition) commonClassDao.getEntityItem(FunctionDefinition.class, "shortname", key);
+                (FunctionDefinition) commonClassDao.getEntityItem(FunctionDefinition.class, "short_name", key);
         if (object != null) {
             return object.getXacmlid();
         }