Unit/SONAR/Checkstyle in ONAP-REST

[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / elk / client / PolicyElasticSearchController.java

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 ad6b9cf..48dc46c 100644 (file)
--- 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
@@ -58,12 +58,12 @@ import org.onap.policy.rest.jpa.GroupPolicyScopeList;
 import org.onap.policy.rest.jpa.MicroServiceLocation;
 import org.onap.policy.rest.jpa.MicroServiceModels;
 import org.onap.policy.rest.jpa.OnapName;
-import org.onap.policy.rest.jpa.PEPOptions;
+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;
@@ -340,7 +340,7 @@ public class PolicyElasticSearchController {
                     break;
                 case onapName:
                     OnapName onapName = mapper.readValue(root.get("data").toString(), OnapName.class);
-                    value = onapName.getOnapName();
+                    value = onapName.getName();
                     policyList = searchElkDatabase(all, "onapName", value);
                     break;
                 case actionPolicy:
@@ -356,7 +356,7 @@ public class PolicyElasticSearchController {
                     policyList = searchElkDatabase(config, "ruleName", value);
                     break;
                 case pepOptions:
-                    PEPOptions pEPOptions = mapper.readValue(root.get("data").toString(), PEPOptions.class);
+                    PepOptions pEPOptions = mapper.readValue(root.get("data").toString(), PepOptions.class);
                     value = pEPOptions.getPepName();
                     policyList = searchElkDatabase(closedloop, "jsonBodyData.pepName", value);
                     break;
@@ -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: