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 36ecf83..f21ac60 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
@@ -48,17 +48,17 @@ import org.onap.policy.rest.adapter.PolicyRestAdapter;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.ActionPolicyDict;
 import org.onap.policy.rest.jpa.Attribute;
-import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.BrmsParamTemplate;
 import org.onap.policy.rest.jpa.ClosedLoopD2Services;
 import org.onap.policy.rest.jpa.ClosedLoopSite;
-import org.onap.policy.rest.jpa.DCAEuuid;
+import org.onap.policy.rest.jpa.DcaeUuid;
 import org.onap.policy.rest.jpa.DecisionSettings;
 import org.onap.policy.rest.jpa.DescriptiveScope;
 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;
@@ -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:
@@ -350,13 +350,13 @@ public class PolicyElasticSearchController {
                     policyList = searchElkDatabase(action, "actionAttributeValue", value);
                     break;
                 case brmsParam:
-                    BRMSParamTemplate bRMSParamTemplate =
-                            mapper.readValue(root.get("data").toString(), BRMSParamTemplate.class);
+                    BrmsParamTemplate bRMSParamTemplate =
+                            mapper.readValue(root.get("data").toString(), BrmsParamTemplate.class);
                     value = bRMSParamTemplate.getRuleName();
                     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;
@@ -399,7 +399,7 @@ public class PolicyElasticSearchController {
                     policyList = searchElkDatabase(config, pholder, value);
                     break;
                 case msDCAEUUID:
-                    DCAEuuid dcaeUUID = mapper.readValue(root.get("data").toString(), DCAEuuid.class);
+                    DcaeUuid dcaeUUID = mapper.readValue(root.get("data").toString(), DcaeUuid.class);
                     value = dcaeUUID.getName();
                     policyList = searchElkDatabase(config, "uuid", value);
                     break;