Use org.onap.aaf dependencies

[policy/engine.git] / PolicyEngineUtils / src / main / java / org / onap / policy / utils / AAFPolicyClientImpl.java

diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java
index 0f48760..7abf60d 100644 (file)
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java
@@ -24,16 +24,16 @@ package org.onap.policy.utils;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConDME2;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.config.Config;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CadiException;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFCon;
-import com.att.cadi.aaf.v2_0.AAFConDME2;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.config.Config;
 
 
 /**
@@ -62,12 +62,9 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
        private static AAFCon<?> aafCon = null;
        private static AAFLurPerm aafLurPerm = null;
        private static AAFAuthn<?> aafAuthn = null;
-       private static Access access = null;
+       private static PropAccess access = null;
 
        private AAFPolicyClientImpl(Properties properties) throws AAFPolicyException{
-               if(instance == null){
-                       instance = this;
-               }
                setup(properties);
        }
 
@@ -93,7 +90,6 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
                        props.setProperty("AFT_LATITUDE", properties.getProperty("AFT_LATITUDE", DEFAULT_AFT_LATITUDE));
                        props.setProperty("AFT_LONGITUDE", properties.getProperty("AFT_LONGITUDE", DEFAULT_AFT_LONGITUDE));
                        String aftEnv = TEST_AFT_ENVIRONMENT;
-                       //props.setProperty(Config.CADI_KEYFILE,"keyfile");
                        props.setProperty("aaf_id",properties.getProperty("aaf_id", "aafID"));
                        props.setProperty("aaf_password", properties.getProperty("aaf_password", "aafPass"));
                        if(properties.containsKey(Config.AAF_URL)){
@@ -127,6 +123,7 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
         * @param properties  Properties with CLIENT_ID, CLIENT_KEY and ENVIRONMENT
         * @throws AAFPolicyException exceptions if any.
         */
+       @Override
        public void updateProperties(Properties properties) throws AAFPolicyException{
                setup(properties);
        }
@@ -141,6 +138,7 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
         * @param action Permissions Action. 
         * @return
         */
+       @Override
        public boolean checkAuthPerm(String mechID, String pass, String type, String instance, String action){
                return checkAuth(mechID, pass) && checkPerm(mechID, pass, type, instance, action);
        }
@@ -152,6 +150,7 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
         * @param pass Password.
         * @return True or False. 
         */
+       @Override
        public boolean checkAuth(String userName, String pass){
                if(aafAuthn!=null){
                        try {
@@ -166,7 +165,6 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
                                logger.error(e.getMessage() + e);
                        }
                }
-               logger.info("Authentication failed for : " + userName + " in " + props.getProperty(Config.AAF_URL));
                return false;
        }
 
@@ -180,6 +178,7 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
         * @param action Permissions Action. 
         * @return True or False. 
         */
+       @Override
        public boolean checkPerm(String userName, String pass, String type, String instance, String action){
                int i =0;
                Boolean result= false;
@@ -194,7 +193,6 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
                                        aafLurPerm.destroy();
                                }
                        }
-                       logger.info("Permissions for : " + userName + " in " + props.getProperty(Config.AAF_URL) + " for " + type  + "," + instance + "," + action + "\n Result is: " + result);
                        i++;
                }while(i<2 && !result); // Try once more to check if this can be passed. AAF has some issues. 
                return result;
@@ -203,8 +201,8 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
        private static boolean setUpAAF(){
                try {
                        aafCon = new AAFConDME2(access);
-                       aafLurPerm = aafCon.newLur();//new AAFLurPerm(aafCon);
-                       aafAuthn = aafCon.newAuthn(aafLurPerm);//new AAFAuthn(aafCon, aafLurPerm);
+                       aafLurPerm = aafCon.newLur();
+                       aafAuthn = aafCon.newAuthn(aafLurPerm);
                        return true;
                } catch (Exception e) {
                        logger.error("Error while setting up AAF Connection " + e.getMessage() + e);