Merge "Fix technical debt and reduce lines"

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / PolicyController.java

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 bd8c828..2df70c7 100644 (file)
--- 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<Datatype, List<FunctionDefinition>> functionMap = getFunctionDatatypeMap();
-               for (Datatype id : functionMap.keySet()) {
-                       List<FunctionDefinition> functionDefinations = functionMap.get(id);
+               for ( Entry<Datatype, List<FunctionDefinition>> entry : functionMap.entrySet()) {
+                       List<FunctionDefinition> 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("/")){