Rework some sonar critical and major bugs

[clamp.git] / src / main / java / org / onap / clamp / clds / model / prop / PolicyChain.java

diff --git a/src/main/java/org/onap/clamp/clds/model/prop/PolicyChain.java b/src/main/java/org/onap/clamp/clds/model/prop/PolicyChain.java
index 6142e9e..c8c2ef4 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/model/prop/PolicyChain.java
+++ b/src/main/java/org/onap/clamp/clds/model/prop/PolicyChain.java
@@ -63,13 +63,13 @@ public class PolicyChain {
 
     public PolicyChain(JsonNode node) {
 
-        policyId = ModelElement.getValueByName(node, "pid");
-        timeout = ModelElement.getIntValueByName(node, "timeout");
+        policyId = AbstractModelElement.getValueByName(node, "pid");
+        timeout = AbstractModelElement.getIntValueByName(node, "timeout");
 
         // process policy configurations
         JsonNode policyNode = node.get(node.size() - 1).get("policyConfigurations");
         Iterator<JsonNode> itr = policyNode.elements();
-        policyItems = new ArrayList<PolicyItem>();
+        policyItems = new ArrayList<>();
         while (itr.hasNext()) {
             policyItems.add(new PolicyItem(itr.next()));
         }