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=ae473f34fc06d241f90280d1d6014486174da02a;hb=9450c8d0102b9188933b5d26193df754a70a7157;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..ae473f34f 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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;
@@ -45,7 +46,6 @@ import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.model.PDPGroupContainer;
 import org.onap.policy.model.Roles;
 import org.onap.policy.rest.XACMLRestProperties;
-import org.onap.policy.rest.XacmlAdminAuthorization;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.Datatype;
 import org.onap.policy.rest.jpa.FunctionDefinition;
@@ -74,10 +74,6 @@ public class PolicyController extends RestrictedBaseController {
 	private static final Logger	policyLogger	= FlexLogger.getLogger(PolicyController.class);
 
 	private static CommonClassDao commonClassDao;
-
-	// Our authorization object
-	//
-	XacmlAdminAuthorization authorizer = new XacmlAdminAuthorization();
 	//
 	// The PAP Engine
 	//
@@ -164,6 +160,7 @@ public class PolicyController extends RestrictedBaseController {
 	}
 
 	public PolicyController() {
+		// Empty constructor
 	}
 
 	@PostConstruct
@@ -241,8 +238,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 +444,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("/")){
@@ -485,14 +482,6 @@ public class PolicyController extends RestrictedBaseController {
 		PolicyController.commonClassDao = commonClassDao;
 	}
 
-	public XacmlAdminAuthorization getAuthorizer() {
-		return authorizer;
-	}
-
-	public void setAuthorizer(XacmlAdminAuthorization authorizer) {
-		this.authorizer = authorizer;
-	}
-
 	public static Map<Datatype, List<FunctionDefinition>> getMapDatatype2Function() {
 		return mapDatatype2Function;
 	}