X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Felk%2Fclient%2FPolicyElasticSearchController.java;h=48dc46c1bda3f8f204f88e3a36b8b6e233347b89;hp=f21ac60c813db7fd1d51940e70bed2ff414f3edd;hb=refs%2Fchanges%2F49%2F98449%2F4;hpb=d79badf67d5c253eb9883ac823626d7efa16c731

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
index f21ac60c8..48dc46c1b 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
@@ -62,8 +62,8 @@ import org.onap.policy.rest.jpa.PepOptions;
 import org.onap.policy.rest.jpa.RiskType;
 import org.onap.policy.rest.jpa.SafePolicyWarning;
 import org.onap.policy.rest.jpa.TermList;
-import org.onap.policy.rest.jpa.VNFType;
-import org.onap.policy.rest.jpa.VSCLAction;
+import org.onap.policy.rest.jpa.VnfType;
+import org.onap.policy.rest.jpa.VsclAction;
 import org.onap.policy.rest.jpa.VarbindDictionary;
 import org.onap.policy.utils.PolicyUtils;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
@@ -378,13 +378,13 @@ public class PolicyElasticSearchController {
                     policyList = searchElkDatabase(closedloop, jsonBodyData, "*" + value + "*");
                     break;
                 case clVnf:
-                    VNFType vNFType = mapper.readValue(root.get("data").toString(), VNFType.class);
-                    value = vNFType.getVnftype();
+                    VnfType vNFType = mapper.readValue(root.get("data").toString(), VnfType.class);
+                    value = vNFType.getType();
                     policyList = searchElkDatabase(closedloop, jsonBodyData, "*" + value + "*");
                     break;
                 case clVSCL:
-                    VSCLAction vsclAction = mapper.readValue(root.get("data").toString(), VSCLAction.class);
-                    value = vsclAction.getVsclaction();
+                    VsclAction vsclAction = mapper.readValue(root.get("data").toString(), VsclAction.class);
+                    value = vsclAction.getAction();
                     policyList = searchElkDatabase(closedloop, jsonBodyData, "*" + value + "*");
                     break;
                 case decision:
@@ -423,7 +423,7 @@ public class PolicyElasticSearchController {
                     break;
                 case safeRisk:
                     RiskType riskType = mapper.readValue(root.get("data").toString(), RiskType.class);
-                    value = riskType.getRiskName();
+                    value = riskType.getName();
                     policyList = searchElkDatabase(config, "riskType", value);
                     break;
                 case safePolicyWarning: