Refactor Api Auth for AAF

[dmaap/dbcapi.git] / src / main / java / org / onap / dmaap / dbcapi / authentication / ApiPolicy.java

diff --git a/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPolicy.java b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPolicy.java
index 33d0786..6aa2d88 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPolicy.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPolicy.java
@@ -27,18 +27,21 @@ import org.onap.dmaap.dbcapi.util.DmaapConfig;
 public class ApiPolicy extends BaseLoggingClass {
        static String allow = "allow";
        String dClass = null;
-       ApiPermissionInterface perm = null;
+       private boolean useAuthClass;
+       ApiAuthorizationCheckInterface perm = null;
        
        public ApiPolicy() {
                DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
                dClass = p.getProperty( "ApiPermission.Class", allow );
                logger.info( "ApiPolicy implements " + dClass);
                if ( dClass.equalsIgnoreCase( allow )) {
+                       useAuthClass = false;
                        return;
-               }
-
+               }               
+               useAuthClass = true;
+               logger.info( "dClass=" + dClass + " useAuthClass=" + useAuthClass );
                try {
-                       perm = (ApiPermissionInterface) (Class.forName(dClass).newInstance());  
+                       perm = (ApiAuthorizationCheckInterface) (Class.forName(dClass).newInstance());  
                } catch (Exception ee ) {
                        errorLogger.error(DmaapbcLogMessageEnum.UNEXPECTED_CONDITION, "attempting to instantiate " + dClass  );         
                        errorLogger.error( "trace is: " + ee );
@@ -54,5 +57,9 @@ public class ApiPolicy extends BaseLoggingClass {
                perm.check( mechid, pwd, p );
        
        }
+       
+       public boolean getUseAuthClass() {
+               return useAuthClass;
+       }
 
 }