X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FPolicyController.java;h=2df70c726eefb003b940a39287fc7c1c0ddcabb2;hb=9df8b88412f6e890320bc446ba1c83a13e99822d;hp=bd8c8287c4564c8ba4e54f949d10e73d6879faca;hpb=7f94862a50f552f840cbb2a84ee1c3e20fc3c708;p=policy%2Fengine.git diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java index bd8c8287c..2df70c726 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Properties; import javax.annotation.PostConstruct; @@ -164,6 +165,7 @@ public class PolicyController extends RestrictedBaseController { } public PolicyController() { + // Empty constructor } @PostConstruct @@ -241,8 +243,8 @@ public class PolicyController extends RestrictedBaseController { //Initialize the FunctionDefinition table at Server Start up Map> functionMap = getFunctionDatatypeMap(); - for (Datatype id : functionMap.keySet()) { - List functionDefinations = functionMap.get(id); + for ( Entry> entry : functionMap.entrySet()) { + List functionDefinations = entry.getValue(); for (FunctionDefinition functionDef : functionDefinations) { dropDownMap.put(functionDef.getShortname(),functionDef.getXacmlid()); } @@ -447,7 +449,7 @@ public class PolicyController extends RestrictedBaseController { for(Object entity : policyEntity){ PolicyEntity pEntity = (PolicyEntity) entity; String removeExtension = pEntity.getPolicyName().replace(".xml", ""); - String version = removeExtension.substring(removeExtension.lastIndexOf(".")+1); + String version = removeExtension.substring(removeExtension.lastIndexOf('.')+1); av.add(version); } if(policyName.contains("/")){