X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ECOMP-PDP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fpdp%2Frest%2Fconfig%2FPDPApiAuth.java;h=c4573cc0d0a7f0a6a9364a1661486444154513e2;hb=fc5c07705edc4dcb7083b39116a43844bb6a1490;hp=ed98e5420f5ec7af3ba5d61031e0c368659d07a1;hpb=a330af579866dacbe595e2e4ad1dd29cd3c96945;p=policy%2Fengine.git

diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPApiAuth.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPApiAuth.java
index ed98e5420..c4573cc0d 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPApiAuth.java
+++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/config/PDPApiAuth.java
@@ -51,6 +51,10 @@ public class PDPApiAuth {
 	    private static Long oldModified = null;
 	    private static AAFPolicyClient aafClient = null;
 	    
+	    private PDPApiAuth(){
+	    	// Private Constructor
+	    }
+	    
 	    /*
 	     * Set Property by reading the properties File.
 	     */
@@ -84,14 +88,14 @@ public class PDPApiAuth {
 	            String resource) {
 	        try{
 	            String[] userNamePass = PolicyUtils.decodeBasicEncoding(clientEncoding);
-	            if(userNamePass==null){
+	            if(userNamePass==null || userNamePass.length==0){
 	                String usernameAndPassword = null;
 	                byte[] decodedBytes = Base64.getDecoder().decode(clientEncoding);
 	                usernameAndPassword = new String(decodedBytes, "UTF-8");
 	                StringTokenizer tokenizer = new StringTokenizer(usernameAndPassword, ":");
 	                String username = tokenizer.nextToken();
 	                String password = tokenizer.nextToken();
-	                userNamePass=  new String[]{username, password};
+	                userNamePass=  new String[]{username,  password};
 	            }
 	            PolicyLogger.info("User " + userNamePass[0] + " is Accessing Policy Engine API.");
 	            Boolean result = false;
@@ -160,7 +164,7 @@ public class PDPApiAuth {
 	            throw new PolicyEngineException(XACMLErrorConstants.ERROR_SYSTEM_ERROR +"Cannot Load the Properties file", e);
 	        }
 	        // Read the Properties and Load the Clients and their scopes.
-	        clientMap = new HashMap<String, ArrayList<String>>();
+	        clientMap = new HashMap<>();
 	        // 
 	        for (Object propKey : clientProp.keySet()) {
 	            String clientID = (String)propKey; 
@@ -174,7 +178,7 @@ public class PDPApiAuth {
 	                } 
 	            }
 	        }
-	        if (clientMap == null || clientMap.isEmpty()) {
+	        if (clientMap.isEmpty()) {
 	            PolicyLogger.debug(XACMLErrorConstants.ERROR_PERMISSIONS + "No Clients ID , Client Key and Scopes are available. Cannot serve any Clients !!");
 	            throw new PolicyEngineException("Empty Client file");
 	        }