Fixes for sonar critical issues

Fixes for critical and blocker issues reported in sonar.

Issue-Id: POLICY-113
Change-Id: I50969fe93a94b0497f3fb30864a6c45e63208fe6
Signed-off-by: Tej, Tarun <tt3868@att.com>

7 files changed, 1091 insertions, 1032 deletions

diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientDMAAP.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientDMAAP.java
index 3699bfcfb..d031868f0 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientDMAAP.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientDMAAP.java
@@ -10,123 +10,131 @@ import org.onap.policy.api.PDPNotification;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.utils.BusConsumer;
+import org.onap.policy.utils.BusConsumer.DmaapConsumerWrapper;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 
 public class AutoClientDMAAP implements Runnable {
-	private static StdPDPNotification notification = null;
-	private static NotificationScheme scheme = null;
-	private static NotificationHandler handler = null;
-	private static String topic = null;
-	private static boolean status = false; 
-	private static Logger logger = FlexLogger.getLogger(AutoClientDMAAP.class.getName());
-	private static String notficatioinType = null;
-	private static BusConsumer dmaapConsumer = null;
-	private static List<String> dmaapList = null; 
-	private static String aafLogin = null;
-	private static String aafPassword = null;
-	public volatile boolean isRunning = false;
-    
-
-	public AutoClientDMAAP(List<String> dmaapList, String topic, String aafLogin, String aafPassword) {
-	       AutoClientDMAAP.topic = topic;
-	       AutoClientDMAAP.dmaapList = dmaapList;
-	       AutoClientDMAAP.aafLogin = aafLogin;
-	       AutoClientDMAAP.aafPassword = aafPassword;
-	}
-
-	public void setAuto(NotificationScheme scheme,
-			NotificationHandler handler) {
-		AutoClientDMAAP.scheme = scheme;
-		AutoClientDMAAP.handler = handler;
-	}
-
-	public static void setScheme(NotificationScheme scheme) {
-		AutoClientDMAAP.scheme = scheme;
-	}
-	
-	public static boolean getStatus(){
-		return AutoClientDMAAP.status;
-	}
-
-	public static String getTopic() {
-		return AutoClientDMAAP.topic;
-	}
-	
-	public static String getNotficationType(){
-		return AutoClientDMAAP.notficatioinType;
-	}
-
-	public synchronized boolean isRunning() {
-		return this.isRunning;
-	}
-	
-	public synchronized void terminate() {
-		this.isRunning = false;
-	}
-	
-	@Override
-	public void run() {
-		synchronized(this) {
-			this.isRunning = true;
-		}
-		String group =  UUID.randomUUID ().toString ();
-		String id = "0";
-
-		// Stop and Start needs to be done.
-		if (scheme != null && handler!=null) {
-			if (scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS) || scheme.equals(NotificationScheme.AUTO_NOTIFICATIONS)) {
-					
-				// create a loop to listen for messages from DMaaP server
-				try {
-					dmaapConsumer = new BusConsumer.DmaapConsumerWrapper(dmaapList, topic, aafLogin, aafPassword, group, id, 15*1000, 1000 );
-				} catch (Exception e) {
-					logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Unable to create DMaaP Consumer: ", e);
-				} 
-				
-				while (this.isRunning() )
-				{
-					try {
-						for ( String msg : dmaapConsumer.fetch () )
-						{		
-							logger.debug("Auto Notification Recieved Message " + msg + " from DMAAP server : " + dmaapList.toString());
-							notification = NotificationUnMarshal.notificationJSON(msg);
-							callHandler();
-						}
-					} catch (Exception e) {
-						logger.debug("Error in processing DMAAP message");
-					}
-
-				}
-				logger.debug("Stopping DMAAP Consumer loop will no longer fetch messages from the servers");
-			}
-		}
-	}
-
-	private static void callHandler() {
-		if (handler != null && scheme != null) {
-			if (scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS)) {
-				boolean removed = false, updated = false;
-				if (notification.getRemovedPolicies() != null && !notification.getRemovedPolicies().isEmpty()) {
-					removed = true;
-				}
-				if (notification.getLoadedPolicies() != null && !notification.getLoadedPolicies().isEmpty()) {
-					updated = true;
-				}
-				if (removed && updated) {
-					notification.setNotificationType(NotificationType.BOTH);
-				} else if (removed) {
-					notification.setNotificationType(NotificationType.REMOVE);
-				} else if (updated) {
-					notification.setNotificationType(NotificationType.UPDATE);
-				}
-				handler.notificationReceived(notification);
-			} else if (scheme.equals(NotificationScheme.AUTO_NOTIFICATIONS)) {
-				PDPNotification newNotification = MatchStore.checkMatch(notification);
-				if (newNotification.getNotificationType() != null) {
-					handler.notificationReceived(newNotification);
-				}
-			}
-		}
-	}
+    private static StdPDPNotification notification = null;
+    private static NotificationScheme scheme = null;
+    private static NotificationHandler handler = null;
+    private static String topic = null;
+    private static boolean status = false;
+    private static Logger logger = FlexLogger.getLogger(AutoClientDMAAP.class.getName());
+    private static String notficatioinType = null;
+    private static BusConsumer dmaapConsumer = null;
+    private static List<String> dmaapList = null;
+    private static String aafLogin = null;
+    private static String aafPassword = null;
+    private volatile boolean running = false;
+
+    public AutoClientDMAAP(List<String> dmaapList, String topic, String aafLogin, String aafPassword) {
+        AutoClientDMAAP.topic = topic;
+        AutoClientDMAAP.dmaapList = dmaapList;
+        AutoClientDMAAP.aafLogin = aafLogin;
+        AutoClientDMAAP.aafPassword = aafPassword;
+    }
+
+    public static void setAuto(NotificationScheme scheme, NotificationHandler handler) {
+        AutoClientDMAAP.scheme = scheme;
+        AutoClientDMAAP.handler = handler;
+    }
+
+    public static void setScheme(NotificationScheme scheme) {
+        AutoClientDMAAP.scheme = scheme;
+    }
+
+    public static boolean getStatus() {
+        return AutoClientDMAAP.status;
+    }
+
+    public static String getTopic() {
+        return AutoClientDMAAP.topic;
+    }
+
+    public static String getNotficationType() {
+        return AutoClientDMAAP.notficatioinType;
+    }
+
+    public synchronized boolean isRunning() {
+        return this.running;
+    }
+
+    public synchronized void terminate() {
+        this.running = false;
+    }
+
+    @Override
+    public void run() {
+        synchronized (this) {
+            this.running = true;
+        }
+        String group = UUID.randomUUID().toString();
+        String id = "0";
+
+        // Stop and Start needs to be done.
+        if (scheme != null && handler != null) {
+            if (scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS)
+                    || scheme.equals(NotificationScheme.AUTO_NOTIFICATIONS)) {
+
+                // create a loop to listen for messages from DMaaP server
+                try {
+                    setDmaapCosumer(new BusConsumer.DmaapConsumerWrapper(dmaapList, topic, aafLogin, aafPassword, group,
+                            id, 15 * 1000, 1000));
+                } catch (Exception e) {
+                    logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Unable to create DMaaP Consumer: ", e);
+                }
+
+                while (this.isRunning()) {
+                    try {
+                        for (String msg : dmaapConsumer.fetch()) {
+                            logger.debug("Auto Notification Recieved Message " + msg + " from DMAAP server : "
+                                    + dmaapList.toString());
+                            setNotification(NotificationUnMarshal.notificationJSON(msg));
+                            callHandler();
+                        }
+                    } catch (Exception e) {
+                        logger.debug("Error in processing DMAAP message", e);
+                    }
+
+                }
+                logger.debug("Stopping DMAAP Consumer loop will no longer fetch messages from the servers");
+            }
+        }
+    }
+
+    private void setNotification(StdPDPNotification notificationJSON) {
+        notification = notificationJSON;
+    }
+
+    private static void setDmaapCosumer(DmaapConsumerWrapper dmaapConsumerWrapper) {
+        dmaapConsumer = dmaapConsumerWrapper;
+    }
+
+    private static void callHandler() {
+        if (handler != null && scheme != null) {
+            if (scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS)) {
+                boolean removed = false, updated = false;
+                if (notification.getRemovedPolicies() != null && !notification.getRemovedPolicies().isEmpty()) {
+                    removed = true;
+                }
+                if (notification.getLoadedPolicies() != null && !notification.getLoadedPolicies().isEmpty()) {
+                    updated = true;
+                }
+                if (removed && updated) {
+                    notification.setNotificationType(NotificationType.BOTH);
+                } else if (removed) {
+                    notification.setNotificationType(NotificationType.REMOVE);
+                } else if (updated) {
+                    notification.setNotificationType(NotificationType.UPDATE);
+                }
+                handler.notificationReceived(notification);
+            } else if (scheme.equals(NotificationScheme.AUTO_NOTIFICATIONS)) {
+                PDPNotification newNotification = MatchStore.checkMatch(notification);
+                if (newNotification.getNotificationType() != null) {
+                    handler.notificationReceived(newNotification);
+                }
+            }
+        }
+    }
 
 }
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java
index 976b57058..f0d99d09e 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientEnd.java
@@ -32,19 +32,14 @@ import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 
-//import org.apache.log4j.Logger;
 import org.glassfish.tyrus.client.ClientManager;
 import org.onap.policy.api.NotificationHandler;
 import org.onap.policy.api.NotificationScheme;
 import org.onap.policy.api.NotificationType;
 import org.onap.policy.api.PDPNotification;
-import org.onap.policy.std.NotificationStore;
-import org.onap.policy.std.StdPDPNotification;
-
-import org.onap.policy.xacml.api.XACMLErrorConstants;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import org.onap.policy.common.logging.flexlogger.*; 
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.xacml.api.XACMLErrorConstants; 
 
 @ClientEndpoint
 public class AutoClientEnd {
@@ -99,12 +94,10 @@ public class AutoClientEnd {
 							// The URL's will be in Sync according to design Spec. 
 							ManualClientEnd.start(AutoClientEnd.url);
 							StdPDPNotification notification = NotificationStore.getDeltaNotification((StdPDPNotification)ManualClientEnd.result(NotificationScheme.MANUAL_ALL_NOTIFICATIONS));
-							if(notification.getNotificationType()!=null){
-								if(oldNotification!=notification){
-									oldNotification= notification;
-									AutoClientEnd.notification = notification;
-									callHandler();
-								}
+							if(notification.getNotificationType()!=null&&oldNotification!=notification){
+							    oldNotification= notification;
+							    AutoClientEnd.notification = notification;
+							    callHandler();
 							}
 							error = false;
 						}
@@ -136,7 +129,7 @@ public class AutoClientEnd {
 					session.close();
 					session = null;
 				} catch (IOException e) {
-					//
+					logger.error("Error closing websocket connection", e);
 				}
 			}
 			client = null;
@@ -148,7 +141,8 @@ public class AutoClientEnd {
 	private static void callHandler() {
 		if (handler != null && scheme != null) {
 			if (scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS)) {
-				boolean removed = false, updated = false;
+				boolean removed = false;
+				boolean updated = false;
 				if (notification.getRemovedPolicies() != null && !notification.getRemovedPolicies().isEmpty()) {
 					removed = true;
 				}
@@ -182,9 +176,7 @@ public class AutoClientEnd {
 
 	// WebSockets Code..
 	@OnOpen
-	public void onOpen(Session session) throws IOException {
-		// session.getBasicRemote().sendText("Connected to Client with Session: "
-		// + session.getId());
+	public static void onOpen(Session session){
 		logger.debug("Auto Notification Session Started... " + session.getId());
 		if(AutoClientEnd.session == null){
 			AutoClientEnd.session = session;
@@ -192,10 +184,9 @@ public class AutoClientEnd {
 	}
 
 	@OnError
-	public void onError(Session session, Throwable e) {
+	public static void onError(Session session, Throwable e) {
 		// trying to Restart by self.
 		logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Session Error.. "+ session.getId() + "\n Error is : " + e );
-		// logger.error("Exception Occured"+e);
 		stop();
 		if (url != null) {
 			client = null;
@@ -206,7 +197,7 @@ public class AutoClientEnd {
 	}
 
 	@OnClose
-	public void onClose(Session session) {
+	public static void onClose(Session session) {
 		logger.info("Session ended with "+ session.getId());
 		if(!stop && !message){
 			// This Block of code is executed if there is any Network Failure or if the Notification is Down. 
@@ -222,7 +213,7 @@ public class AutoClientEnd {
 	}
 
 	@OnMessage
-	public void onMessage(String message, Session session) throws JsonParseException, JsonMappingException, IOException {
+	public static void onMessage(String message, Session session) throws IOException {
 		AutoClientEnd.message = true;
 		logger.debug("Auto Notification Recieved Message " + message + " Session info is : " + session.getId());
 		try {
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientUEB.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientUEB.java
index 37413f416..f84568aba 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientUEB.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/AutoClientUEB.java
@@ -51,11 +51,11 @@ public class AutoClientUEB implements Runnable  {
 	private static boolean status = false; 
 	private static Logger logger = FlexLogger.getLogger(AutoClientUEB.class.getName());
 	private static String notficatioinType = null;
-	private static CambriaConsumer CConsumer = null;
+	private static CambriaConsumer cConsumer = null;
 	private static String apiKey = null;
 	private static String apiSecret = null;
 	private static List<String> uebURLList = null; 
-	public volatile boolean isRunning = false;
+	private volatile boolean running = false;
     
 
 	public AutoClientUEB(String url, List<String> uebURLList, String apiKey, String apiSecret) {
@@ -65,7 +65,7 @@ public class AutoClientUEB implements Runnable  {
 	       AutoClientUEB.apiKey = apiKey;
 	}
 
-	public void setAuto(NotificationScheme scheme,
+	public static void setAuto(NotificationScheme scheme,
 			NotificationHandler handler) {
 		AutoClientUEB.scheme = scheme;
 		AutoClientUEB.handler = handler;
@@ -88,34 +88,31 @@ public class AutoClientUEB implements Runnable  {
 	}
 
 	public synchronized boolean isRunning() {
-		return this.isRunning;
+		return this.running;
 	}
 	
 	public synchronized void terminate() {
-		this.isRunning = false;
+		this.running = false;
 	}
 	
 	@Override
 	public void run() {
 		synchronized(this) {
-			this.isRunning = true;
+			this.running = true;
 		}
 		String group =  UUID.randomUUID ().toString ();
 		String id = "0";
-		//String topic = null;
 		// Stop and Start needs to be done.
 		if (scheme != null && handler!=null) {
 			if (scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS) || scheme.equals(NotificationScheme.AUTO_NOTIFICATIONS)) {
 				URL aURL;
 				try {
 					aURL = new URL(AutoClientUEB.topic);
-					topic = aURL.getHost() + aURL.getPort();
+					setTopic(aURL.getHost() + aURL.getPort());
 				} catch (MalformedURLException e) {
-					topic = AutoClientUEB.url.replace("[:/]", "");
+					setTopic(AutoClientUEB.url.replace("[:/]", ""));
 				}
-					
 				try {
-					//CConsumer = CambriaClientFactory.createConsumer ( null, uebURLList, topic, group, id, 15*1000, 1000 );
 					ConsumerBuilder builder = new CambriaClientBuilders.ConsumerBuilder();
 					builder.knownAs(group, id)
 					.usingHosts(uebURLList)
@@ -123,35 +120,46 @@ public class AutoClientUEB implements Runnable  {
 					.waitAtServer(15*1000)
 					.receivingAtMost(1000)
 					.authenticatedBy(apiKey, apiSecret);
-					
-					 CConsumer = builder.build();
-					
+					setConsumer(builder.build()); 
 				} catch (Exception e1) {
 					logger.error("Exception Occured" + e1);
 				} 
-				while (this.isRunning() )
-				{
-					try {
-						for ( String msg : CConsumer.fetch () )
-						{		
-							logger.debug("Auto Notification Recieved Message " + msg + " from UEB cluster : " + uebURLList.toString());
-							notification = NotificationUnMarshal.notificationJSON(msg);
-							callHandler();
-						}
-					} catch (Exception e) {
-						logger.debug(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Error in processing UEB message" + e.getMessage());
-					}
+                while (this.isRunning()) {
+                    try {
+                        for (String msg : cConsumer.fetch()) {
+                            logger.debug("Auto Notification Recieved Message " + msg + " from UEB cluster : "
+                                    + uebURLList.toString());
+                            setNotification(NotificationUnMarshal.notificationJSON(msg));
+                            callHandler();
+                        }
+                    } catch (Exception e) {
+                        logger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Error in processing UEB message"
+                                + e.getMessage(), e);
+                    }
 
-				}
+                }
 				logger.debug("Stopping UEB Consumer loop will not logger fetch messages from the cluster");
 			}
 		}
 	}
 
-	private static void callHandler() {
+	private static void setNotification(StdPDPNotification notificationJSON) {
+	    notification = notificationJSON;
+    }
+
+    private static void setConsumer(CambriaConsumer build) {
+	    cConsumer = build;
+    }
+
+    private static void setTopic(String topic) {
+	    AutoClientUEB.topic = topic;
+    }
+
+    private static void callHandler() {
 		if (handler != null && scheme != null) {
 			if (scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS)) {
-				boolean removed = false, updated = false;
+				boolean removed = false;
+				boolean updated = false;
 				if (notification.getRemovedPolicies() != null && !notification.getRemovedPolicies().isEmpty()) {
 					removed = true;
 				}
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java
index 7e4ba07e8..db3fdf194 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEnd.java
@@ -33,7 +33,6 @@ import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 
-//import org.apache.log4j.Logger;
 import org.glassfish.tyrus.client.ClientManager;
 import org.onap.policy.api.NotificationScheme;
 import org.onap.policy.api.NotificationType;
@@ -62,9 +61,7 @@ public class ManualClientEnd {
 		try {
 			client.connectToServer(ManualClientEnd.class, new URI(url+"notifications"));
 			latch.await();
-		} catch (DeploymentException | URISyntaxException | InterruptedException e) {
-			logger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + e);
-		} catch (IOException e) {
+		} catch (DeploymentException | URISyntaxException | InterruptedException |IOException e) {
 			logger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + e);
 		}
 	}
@@ -75,7 +72,8 @@ public class ManualClientEnd {
 			return null;
 		} else {
 			if(scheme.equals(NotificationScheme.MANUAL_ALL_NOTIFICATIONS)) {
-				boolean removed = false, updated = false; 
+				boolean removed = false;
+				boolean updated = false; 
 				if(notification.getRemovedPolicies()!=null && !notification.getRemovedPolicies().isEmpty()){
 					removed = true;
 				}
@@ -118,7 +116,7 @@ public class ManualClientEnd {
 	}
 	
 	@OnMessage
-	public void onMessage(String message, Session session){
+	public static void onMessage(String message, Session session){
 		logger.debug(" Manual Notification Recieved Message : " + message +" Session info is : "+ session.getId());
 		resultJson = message;
 		try {
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEndUEB.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEndUEB.java
index dcd86eb1f..29c85a2ad 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEndUEB.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/ManualClientEndUEB.java
@@ -145,13 +145,12 @@ public class ManualClientEndUEB {
 						logger.debug("Manual Notification Recieved Message " + msg + " from UEB cluster : " + uebURLList.toString());
 						resultJson = msg;
 						if (!msg.contains("UEB Update")){
-//							System.out.println("Manual Notification Recieved Message " + msg + " from UEB cluster : " + uebURLList.toString());
 							notification = NotificationUnMarshal.notificationJSON(msg);
 							count = 4;
 						}
 					}
 				}catch (Exception e) {
-					
+					logger.error("Error in Manual CLient UEB notification ", e);
 				} 
 				count++;
 			}		
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/NotificationUnMarshal.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/NotificationUnMarshal.java
index 2ec174c84..447e7cb26 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/NotificationUnMarshal.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/NotificationUnMarshal.java
@@ -20,49 +20,45 @@
 
 package org.onap.policy.std;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 
 import org.onap.policy.api.LoadedPolicy;
 import org.onap.policy.api.RemovedPolicy;
 import org.onap.policy.api.UpdateType;
-import org.onap.policy.std.StdLoadedPolicy;
-import org.onap.policy.std.StdPDPNotification;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class NotificationUnMarshal {
-	private static StdPDPNotification notification;
 	
-	public static StdPDPNotification notificationJSON(String json) throws Exception{
+	public static StdPDPNotification notificationJSON(String json) throws IOException{
 		ObjectMapper mapper = new ObjectMapper();
-		notification = mapper.readValue(json, StdPDPNotification.class);
-		if(notification!=null){
-			if(notification.getLoadedPolicies()!=null){
-				Collection<StdLoadedPolicy> stdLoadedPolicies = new ArrayList<>();
-				for(LoadedPolicy loadedPolicy: notification.getLoadedPolicies()){
-					StdLoadedPolicy stdLoadedPolicy = (StdLoadedPolicy) loadedPolicy;
-					if(notification.getRemovedPolicies()!=null){
-						Boolean updated = false;
-						for(RemovedPolicy removedPolicy: notification.getRemovedPolicies()){
-							String regex = ".(\\d)*.xml";
-							if(removedPolicy.getPolicyName().replaceAll(regex, "").equals(stdLoadedPolicy.getPolicyName().replaceAll(regex, ""))){
-								updated  = true;
-								break;
-							}
-						}
-						if(updated){
-							stdLoadedPolicy.setUpdateType(UpdateType.UPDATE);
-						}else{
-							stdLoadedPolicy.setUpdateType(UpdateType.NEW);
-						}
-					}else{
-						stdLoadedPolicy.setUpdateType(UpdateType.NEW);
-					}
-					stdLoadedPolicies.add(stdLoadedPolicy);
-				}
-				notification.setLoadedPolicies(stdLoadedPolicies);
-			}
+		StdPDPNotification notification = mapper.readValue(json, StdPDPNotification.class);
+		if(notification!=null&&notification.getLoadedPolicies()!=null){
+		    Collection<StdLoadedPolicy> stdLoadedPolicies = new ArrayList<>();
+		    for(LoadedPolicy loadedPolicy: notification.getLoadedPolicies()){
+		        StdLoadedPolicy stdLoadedPolicy = (StdLoadedPolicy) loadedPolicy;
+		        if(notification.getRemovedPolicies()!=null){
+		            Boolean updated = false;
+		            for(RemovedPolicy removedPolicy: notification.getRemovedPolicies()){
+		                String regex = ".(\\d)*.xml";
+		                if(removedPolicy.getPolicyName().replaceAll(regex, "").equals(stdLoadedPolicy.getPolicyName().replaceAll(regex, ""))){
+		                    updated  = true;
+		                    break;
+		                }
+		            }
+		            if(updated){
+		                stdLoadedPolicy.setUpdateType(UpdateType.UPDATE);
+		            }else{
+		                stdLoadedPolicy.setUpdateType(UpdateType.NEW);
+		            }
+		        }else{
+		            stdLoadedPolicy.setUpdateType(UpdateType.NEW);
+		        }
+		        stdLoadedPolicies.add(stdLoadedPolicy);
+		    }
+		    notification.setLoadedPolicies(stdLoadedPolicies);
 		}
 		return notification;
 	}
diff --git a/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java
index 8a6c6c668..4e904b6e1 100644
--- a/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java
@@ -18,7 +18,6 @@
  * ============LICENSE_END=========================================================
  */
 
-
 package org.onap.policy.std;
 
 import java.io.FileInputStream;
@@ -107,184 +106,189 @@ import com.google.gson.GsonBuilder;
  * @version 1.0
  */
 public class StdPolicyEngine {
-	private static final String ERROR_AUTH_GET_PERM = "You are not allowed to Make this Request. Please contact PolicyAdmin to give access to: ";
-	private static final String DEFAULT_NOTIFICATION = "websocket";
-	
-	private String propertyFilePath = null;
-	private String clientEncoding = null;
-	private String contentType = null;
-	private static List<String> pdps = null;
-	private static String environment= null; 
-	private static String userName = null;
-	private static String pass = null; 
-	private static List<String> encoding = null;
-	private static boolean junit = false;
-	private List<String> pdpDefault = null;
-	private List<String> typeDefault = null;
-	private List<String> notificationType = new ArrayList<String>();
-	private List<String> notificationURLList = new ArrayList<String>();
-	private NotificationScheme scheme = null;
-	private NotificationHandler handler = null;
-	private AutoClientUEB uebClientThread = null;
-	private Thread registerUEBThread = null;
-	private boolean uebThread = false;
-	private AutoClientDMAAP dmaapClientThread = null;
-	private Thread registerDMAAPThread = null;
-	private boolean dmaapThread = false;
-	private String topic = null;
-	private String apiKey = null;
-	private String apiSecret = null;
-
-	private static final String UNIQUEID = UUID.randomUUID ().toString ();
-	private static final Logger LOGGER = FlexLogger.getLogger(StdPolicyConfig.class.getName());
-	
-	/*
-	 * Taking the Property file even if it null.
-	 */
-	public StdPolicyEngine(String propertyFilePath, String clientKey) throws PolicyEngineException {
-		setProperty(propertyFilePath, clientKey);
-	}
-
-	/*
-	 * Taking the Notification Constructor.
-	 */
-	public StdPolicyEngine(String propertyFilePath,
-						   NotificationScheme scheme,
-						   NotificationHandler handler) throws PolicyEngineException {
-		setProperty(propertyFilePath, null);
-		this.scheme = scheme;
-		this.handler = handler;
-		if ((!"ueb".equals(notificationType.get(0)))||(!"dmaap".equals(notificationType.get(0)))){
-			AutoClientEnd.setAuto(scheme, handler);
-		}
-		notification(scheme, handler);
-	}
-
-	/*
-	 * Taking the Notification Constructor.
-	 */
-	public StdPolicyEngine(String propertyFilePath, NotificationScheme scheme) throws PolicyEngineException {
-		setProperty(propertyFilePath, null);
-		this.scheme = scheme;
-		setScheme(scheme);
-	}
-
-	/*
-	 * sendEvent API Implementation
-	 */
-	public Collection<PolicyResponse> sendEvent(Map<String, String> eventAttributes, UUID requestID) throws PolicyEventException {
-		return sendEventImpl(eventAttributes, requestID);
-	}
-	
-	/*
-	 * sendEvent API Implementation for eventRequestParameters 
-	 */
-	public Collection<PolicyResponse> sendEvent(EventRequestParameters eventRequestParameters) throws PolicyEventException{
-		if(eventRequestParameters==null){
-			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No event Request Parameters Given. ";
-			LOGGER.error(message);
-			throw new PolicyEventException(message);
-		}
-		return sendEventImpl(eventRequestParameters.getEventAttributes(), eventRequestParameters.getRequestID());
-	}
-
-	/*
-	 * getConfig using configRequestParameters Implementation 
-	 */
-	public Collection<PolicyConfig> getConfig(ConfigRequestParameters configRequestParameters) throws PolicyConfigException{
-		return getConfigImpl(configRequestParameters);
-	}
-	
-	/*
-	 * listPolicies using configRequestParameters Implementation
-	 */
-	public Collection<String> listConfig(ConfigRequestParameters listPolicyRequestParameters) throws PolicyConfigException{
-		return listConfigImpl(listPolicyRequestParameters);
-	}
-
-	/*
-	 * getDecision using the decision Attributes.
-	 */
-	public DecisionResponse getDecision(String onapName, Map<String, String> decisionAttributes, UUID requestID) throws PolicyDecisionException {
-		return getDecisionImpl(onapName, decisionAttributes, requestID);
-	}
-	
-	/*
-	 * getDecision Using decisionRequestParameters.  
-	 */
-	public DecisionResponse getDecision(DecisionRequestParameters decisionRequestParameters) throws PolicyDecisionException{
-		if(decisionRequestParameters==null){
-			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Decision Request Parameters Given. ";
-			LOGGER.error(message);
-			throw new PolicyDecisionException(message);
-		}
-		return getDecisionImpl(decisionRequestParameters.getOnapName(), decisionRequestParameters.getDecisionAttributes(), decisionRequestParameters.getRequestID());
-	}
-	
-	/*
-	 * getMetrics using metricsRequestParameters
-	 */
-	public MetricsResponse getMetrics(MetricsRequestParameters parameters) throws PolicyException{
-		return getMetricsImpl(parameters);
-	}
-	
-	public MetricsResponse getMetricsImpl(MetricsRequestParameters parameters) throws PolicyException{
-		StdMetricsResponse response = new StdMetricsResponse();
-		String resource = "getMetrics";
-		String body = new String();
-		
-		//  Create the Request
-		try {
-			if (parameters!=null) {
-				body = PolicyUtils.objectToJsonString(parameters);
-			}
-		} catch (JsonProcessingException e) {
-			String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
-			LOGGER.error(message);
-			throw new PolicyException(message, e);
-		}
-        // Get Response. 
+    private static final String ERROR_AUTH_GET_PERM = "You are not allowed to Make this Request. Please contact PolicyAdmin to give access to: ";
+    private static final String DEFAULT_NOTIFICATION = "websocket";
+
+    private String clientEncoding = null;
+    private String contentType = null;
+    private static List<String> pdps = null;
+    private static String environment = null;
+    private static String userName = null;
+    private static String pass = null;
+    private static List<String> encoding = null;
+    private static boolean junit = false;
+    private List<String> pdpDefault = null;
+    private List<String> typeDefault = null;
+    private List<String> notificationType = new ArrayList<>();
+    private List<String> notificationURLList = new ArrayList<>();
+    private NotificationScheme scheme = null;
+    private NotificationHandler handler = null;
+    private AutoClientUEB uebClientThread = null;
+    private Thread registerUEBThread = null;
+    private boolean uebThread = false;
+    private AutoClientDMAAP dmaapClientThread = null;
+    private Thread registerDMAAPThread = null;
+    private boolean dmaapThread = false;
+    private String topic = null;
+    private String apiKey = null;
+    private String apiSecret = null;
+
+    private static final String UNIQUEID = UUID.randomUUID().toString();
+    private static final Logger LOGGER = FlexLogger.getLogger(StdPolicyConfig.class.getName());
+
+    /*
+     * Taking the Property file even if it null.
+     */
+    public StdPolicyEngine(String propertyFilePath, String clientKey) throws PolicyEngineException {
+        setProperty(propertyFilePath, clientKey);
+    }
+
+    /*
+     * Taking the Notification Constructor.
+     */
+    public StdPolicyEngine(String propertyFilePath, NotificationScheme scheme, NotificationHandler handler)
+            throws PolicyEngineException {
+        setProperty(propertyFilePath, null);
+        this.scheme = scheme;
+        this.handler = handler;
+        if ((!"ueb".equals(notificationType.get(0))) || (!"dmaap".equals(notificationType.get(0)))) {
+            AutoClientEnd.setAuto(scheme, handler);
+        }
+        notification(scheme, handler);
+    }
+
+    /*
+     * Taking the Notification Constructor.
+     */
+    public StdPolicyEngine(String propertyFilePath, NotificationScheme scheme) throws PolicyEngineException {
+        setProperty(propertyFilePath, null);
+        this.scheme = scheme;
+        setScheme(scheme);
+    }
+
+    /*
+     * sendEvent API Implementation
+     */
+    public Collection<PolicyResponse> sendEvent(Map<String, String> eventAttributes, UUID requestID)
+            throws PolicyEventException {
+        return sendEventImpl(eventAttributes, requestID);
+    }
+
+    /*
+     * sendEvent API Implementation for eventRequestParameters
+     */
+    public Collection<PolicyResponse> sendEvent(EventRequestParameters eventRequestParameters)
+            throws PolicyEventException {
+        if (eventRequestParameters == null) {
+            String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No event Request Parameters Given. ";
+            LOGGER.error(message);
+            throw new PolicyEventException(message);
+        }
+        return sendEventImpl(eventRequestParameters.getEventAttributes(), eventRequestParameters.getRequestID());
+    }
+
+    /*
+     * getConfig using configRequestParameters Implementation
+     */
+    public Collection<PolicyConfig> getConfig(ConfigRequestParameters configRequestParameters)
+            throws PolicyConfigException {
+        return getConfigImpl(configRequestParameters);
+    }
+
+    /*
+     * listPolicies using configRequestParameters Implementation
+     */
+    public Collection<String> listConfig(ConfigRequestParameters listPolicyRequestParameters)
+            throws PolicyConfigException {
+        return listConfigImpl(listPolicyRequestParameters);
+    }
+
+    /*
+     * getDecision using the decision Attributes.
+     */
+    public DecisionResponse getDecision(String onapName, Map<String, String> decisionAttributes, UUID requestID)
+            throws PolicyDecisionException {
+        return getDecisionImpl(onapName, decisionAttributes, requestID);
+    }
+
+    /*
+     * getDecision Using decisionRequestParameters.
+     */
+    public DecisionResponse getDecision(DecisionRequestParameters decisionRequestParameters)
+            throws PolicyDecisionException {
+        if (decisionRequestParameters == null) {
+            String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Decision Request Parameters Given. ";
+            LOGGER.error(message);
+            throw new PolicyDecisionException(message);
+        }
+        return getDecisionImpl(decisionRequestParameters.getOnapName(),
+                decisionRequestParameters.getDecisionAttributes(), decisionRequestParameters.getRequestID());
+    }
+
+    /*
+     * getMetrics using metricsRequestParameters
+     */
+    public MetricsResponse getMetrics(MetricsRequestParameters parameters) throws PolicyException {
+        return getMetricsImpl(parameters);
+    }
+
+    public MetricsResponse getMetricsImpl(MetricsRequestParameters parameters) throws PolicyException {
+        StdMetricsResponse response = new StdMetricsResponse();
+        String resource = "getMetrics";
+        String body = null;
+        // Create the Request
+        try {
+            if (parameters != null) {
+                body = PolicyUtils.objectToJsonString(parameters);
+            }
+        } catch (JsonProcessingException e) {
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
+            LOGGER.error(message);
+            throw new PolicyException(message, e);
+        }
+        // Get Response.
         try {
             ResponseEntity<String> result = callNewPDP(resource, HttpMethod.GET, body, String.class);
             // Process response
             response.setResponseMessage(result.getBody());
             response.setResponseCode(result.getStatusCode().value());
         } catch (PolicyException exception) {
-    	    if(exception.getCause()!=null && exception.getCause() instanceof HttpClientErrorException){
+            if (exception.getCause() != null && exception.getCause() instanceof HttpClientErrorException) {
                 LOGGER.error(exception);
                 HttpClientErrorException ex = (HttpClientErrorException) exception.getCause();
                 response.setResponseCode(ex.getRawStatusCode());
                 response.setResponseMessage(exception.getMessage());
                 return response;
-            }else{
-                String message = XACMLErrorConstants.ERROR_SYSTEM_ERROR+ "Error while processing results. please check logs.";
+            } else {
+                String message = XACMLErrorConstants.ERROR_SYSTEM_ERROR
+                        + "Error while processing results. please check logs.";
                 LOGGER.error(message, exception);
                 throw new PolicyException(message, exception);
-            }         
+            }
         }
-		return response;
-	}
-	
-	/*
-	 * PushPolicy using pushPolicyParameters. 
-	 */
-	public PolicyChangeResponse pushPolicy(PushPolicyParameters pushPolicyParameters) throws PolicyException{
-		return pushPolicyImpl(pushPolicyParameters);
-	}
-	
-	public PolicyChangeResponse pushPolicyImpl(PushPolicyParameters pushPolicyParameters) throws PolicyException{
-		StdPolicyChangeResponse response = new StdPolicyChangeResponse();
-		String resource= "pushPolicy";
-        String body = new String();
-        // Create Request. 
+        return response;
+    }
+
+    /*
+     * PushPolicy using pushPolicyParameters.
+     */
+    public PolicyChangeResponse pushPolicy(PushPolicyParameters pushPolicyParameters) throws PolicyException {
+        return pushPolicyImpl(pushPolicyParameters);
+    }
+
+    public PolicyChangeResponse pushPolicyImpl(PushPolicyParameters pushPolicyParameters) throws PolicyException {
+        StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+        String resource = "pushPolicy";
+        String body = null;
+        // Create Request.
         try {
             body = PolicyUtils.objectToJsonString(pushPolicyParameters);
         } catch (JsonProcessingException e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyException(message, e);
         }
-        // Get Response. 
+        // Get Response.
         try {
             ResponseEntity<String> result = callNewPDP(resource, HttpMethod.PUT, body, String.class);
             // Process response
@@ -294,28 +298,28 @@ public class StdPolicyEngine {
             return processException(exception);
         }
         return response;
-	}
-	
-	/*
-	 * Delete a Policy using deletePolicyParameters
-	 */
-	public PolicyChangeResponse deletePolicy(DeletePolicyParameters parameters) throws PolicyException {
-		return deletePolicyImpl(parameters);
-	}
-	
-	public PolicyChangeResponse deletePolicyImpl(DeletePolicyParameters parameters) throws PolicyException {
-		StdPolicyChangeResponse response = new StdPolicyChangeResponse();
-		String resource= "deletePolicy";
-		String body = new String();
-        // Create Request. 
+    }
+
+    /*
+     * Delete a Policy using deletePolicyParameters
+     */
+    public PolicyChangeResponse deletePolicy(DeletePolicyParameters parameters) throws PolicyException {
+        return deletePolicyImpl(parameters);
+    }
+
+    public PolicyChangeResponse deletePolicyImpl(DeletePolicyParameters parameters) throws PolicyException {
+        StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+        String resource = "deletePolicy";
+        String body = null;
+        // Create Request.
         try {
             body = PolicyUtils.objectToJsonString(parameters);
         } catch (JsonProcessingException e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyException(message, e);
         }
-        // Get Response. 
+        // Get Response.
         try {
             ResponseEntity<String> result = callNewPDP(resource, HttpMethod.DELETE, body, String.class);
             // Process response
@@ -325,61 +329,64 @@ public class StdPolicyEngine {
             return processException(exception);
         }
         return response;
-	}
-
-	/*
-	 * getDictionaryItem Using dictionaryParameters
-	 */
-	public DictionaryResponse getDictionaryItem(DictionaryParameters parameters) throws PolicyException {
-		return getDictionaryItemImpl(parameters);
-	}
-	
-	public DictionaryResponse getDictionaryItemImpl(DictionaryParameters parameters) throws PolicyException{
-		StdDictionaryResponse response = new StdDictionaryResponse();
-		String resource="getDictionaryItems";
-		String body = "{}";
-		// Create Request. 
+    }
+
+    /*
+     * getDictionaryItem Using dictionaryParameters
+     */
+    public DictionaryResponse getDictionaryItem(DictionaryParameters parameters) throws PolicyException {
+        return getDictionaryItemImpl(parameters);
+    }
+
+    public DictionaryResponse getDictionaryItemImpl(DictionaryParameters parameters) throws PolicyException {
+        StdDictionaryResponse response = new StdDictionaryResponse();
+        String resource = "getDictionaryItems";
+        String body = "{}";
+        // Create Request.
         try {
             body = PolicyUtils.objectToJsonString(parameters);
         } catch (JsonProcessingException e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyException(message, e);
         }
-        // Get Response. 
+        // Get Response.
         try {
-            ResponseEntity<APIDictionaryResponse> result = callNewPDP(resource, HttpMethod.POST, body, APIDictionaryResponse.class);
+            ResponseEntity<APIDictionaryResponse> result = callNewPDP(resource, HttpMethod.POST, body,
+                    APIDictionaryResponse.class);
             // Process response
             response = dictionaryResult(result.getBody());
         } catch (Exception exception) {
-            if(exception.getCause().getMessage().contains("401")){
+            if (exception.getCause().getMessage().contains("401")) {
                 String message = XACMLErrorConstants.ERROR_PERMISSIONS + ERROR_AUTH_GET_PERM + resource;
                 LOGGER.error(message);
                 response.setResponseMessage(message);
                 response.setResponseCode(401);
                 return response;
-            }if(exception.getCause().getMessage().contains("400")){
+            }
+            if (exception.getCause().getMessage().contains("400")) {
                 String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Invalid Data is given.";
                 response.setResponseMessage(message);
                 response.setResponseCode(400);
                 return response;
             }
-            String message = XACMLErrorConstants.ERROR_PERMISSIONS+ "Unable to get valid Response from  PDP(s) " + pdps;
+            String message = XACMLErrorConstants.ERROR_PERMISSIONS + "Unable to get valid Response from  PDP(s) "
+                    + pdps;
             LOGGER.error(message, exception);
             response.setResponseMessage(message);
             response.setResponseCode(500);
             return response;
         }
-        return response;		
-	}
-	
-	@SuppressWarnings("unchecked")
+        return response;
+    }
+
+    @SuppressWarnings("unchecked")
     private StdDictionaryResponse dictionaryResult(APIDictionaryResponse body) {
         StdDictionaryResponse response = new StdDictionaryResponse();
         response.setResponseCode(body.getResponseCode());
         response.setResponseMessage(body.getResponseMessage());
         response.setDictionaryData((Map<String, String>) body.getDictionaryData());
-        if(body.getDictionaryJson()!=null){
+        if (body.getDictionaryJson() != null) {
             Gson objGson = new GsonBuilder().create();
             String mapToJson = objGson.toJson(body.getDictionaryJson());
             JsonReader jsonReader = Json.createReader(new StringReader(mapToJson));
@@ -391,35 +398,36 @@ public class StdPolicyEngine {
     }
 
     /*
-	 * createDictinaryItem Using dictionaryParameters. 
-	 */
-	public PolicyChangeResponse createDictionaryItem(DictionaryParameters parameters) throws PolicyException{
-		return createUpdateDictionaryItemImpl(parameters, false);
-	}
-	
-	/*
-	 * updateDictinaryItem Using dictionaryParameters. 
-	 */
-	public PolicyChangeResponse updateDictionaryItem(DictionaryParameters parameters) throws PolicyException{
-		return createUpdateDictionaryItemImpl(parameters, true);
-	}
-	
-	public PolicyChangeResponse createUpdateDictionaryItemImpl(DictionaryParameters parameters, boolean updateFlag) throws PolicyException{
-		StdPolicyChangeResponse response = new StdPolicyChangeResponse();
-		String resource = "createDictionaryItem";
-		if(updateFlag){
-		    resource = "updateDictionaryItem";
-		}
-		String body = new String();
-        // Create Request. 
+     * createDictinaryItem Using dictionaryParameters.
+     */
+    public PolicyChangeResponse createDictionaryItem(DictionaryParameters parameters) throws PolicyException {
+        return createUpdateDictionaryItemImpl(parameters, false);
+    }
+
+    /*
+     * updateDictinaryItem Using dictionaryParameters.
+     */
+    public PolicyChangeResponse updateDictionaryItem(DictionaryParameters parameters) throws PolicyException {
+        return createUpdateDictionaryItemImpl(parameters, true);
+    }
+
+    public PolicyChangeResponse createUpdateDictionaryItemImpl(DictionaryParameters parameters, boolean updateFlag)
+            throws PolicyException {
+        StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+        String resource = "createDictionaryItem";
+        if (updateFlag) {
+            resource = "updateDictionaryItem";
+        }
+        String body = null;
+        // Create Request.
         try {
             body = PolicyUtils.objectToJsonString(parameters);
         } catch (JsonProcessingException e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyException(message, e);
         }
-        // Get Response. 
+        // Get Response.
         try {
             ResponseEntity<String> result = callNewPDP(resource, HttpMethod.PUT, body, String.class);
             // Process response
@@ -429,31 +437,31 @@ public class StdPolicyEngine {
             return processException(exception);
         }
         return response;
-	}
-	
-	/*
-	 * PolicyEngine Import  
-	 */
-	public PolicyChangeResponse policyEngineImport(ImportParameters importParameters) throws PolicyException {
-		return policyEngineImportImpl(importParameters);
-	}
-	
-	public PolicyChangeResponse policyEngineImportImpl(ImportParameters importParameters) throws PolicyException {
-		StdPolicyChangeResponse response = new StdPolicyChangeResponse();
-		String resource= "policyEngineImport";
-		LinkedMultiValueMap<String, Object> parameters = new LinkedMultiValueMap<String, Object>();
-        // Create Request. 
+    }
+
+    /*
+     * PolicyEngine Import
+     */
+    public PolicyChangeResponse policyEngineImport(ImportParameters importParameters) throws PolicyException {
+        return policyEngineImportImpl(importParameters);
+    }
+
+    public PolicyChangeResponse policyEngineImportImpl(ImportParameters importParameters) throws PolicyException {
+        StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+        String resource = "policyEngineImport";
+        LinkedMultiValueMap<String, Object> parameters = new LinkedMultiValueMap<String, Object>();
+        // Create Request.
         try {
             String body = PolicyUtils.objectToJsonString(importParameters);
             parameters.set("importParametersJson", body);
             parameters.set("file", new FileSystemResource(importParameters.getFilePath()));
         } catch (Exception e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyException(message, e);
         }
         contentType = MediaType.MULTIPART_FORM_DATA_VALUE;
-        // Get Response. 
+        // Get Response.
         try {
             ResponseEntity<String> result = callNewPDP(resource, HttpMethod.POST, parameters, String.class);
             // Process response
@@ -461,42 +469,43 @@ public class StdPolicyEngine {
             response.setResponseCode(result.getStatusCode().value());
         } catch (PolicyException exception) {
             return processException(exception);
-        } finally{
+        } finally {
             contentType = null;
         }
         return response;
-	}
-	
-	/*
-	 * createPolicy Using policyParameters. 
-	 */
-	public PolicyChangeResponse createPolicy(PolicyParameters policyParameters) throws PolicyException{
-		return createUpdatePolicyImpl(policyParameters, false);
-	}
-	
-	/*
-	 * updatePolicy using policyParameters. 
-	 */
-	public PolicyChangeResponse updatePolicy(PolicyParameters policyParameters) throws PolicyException{
-		return createUpdatePolicyImpl(policyParameters, true);
-	}
-	
-	public PolicyChangeResponse createUpdatePolicyImpl(PolicyParameters policyParameters, boolean updateFlag) throws PolicyException{
-		StdPolicyChangeResponse response = new StdPolicyChangeResponse();
-		String resource= "createPolicy";
-		if(updateFlag){
-		    resource="updatePolicy";
-		}
-		String body = new String();
-        // Create Request. 
+    }
+
+    /*
+     * createPolicy Using policyParameters.
+     */
+    public PolicyChangeResponse createPolicy(PolicyParameters policyParameters) throws PolicyException {
+        return createUpdatePolicyImpl(policyParameters, false);
+    }
+
+    /*
+     * updatePolicy using policyParameters.
+     */
+    public PolicyChangeResponse updatePolicy(PolicyParameters policyParameters) throws PolicyException {
+        return createUpdatePolicyImpl(policyParameters, true);
+    }
+
+    public PolicyChangeResponse createUpdatePolicyImpl(PolicyParameters policyParameters, boolean updateFlag)
+            throws PolicyException {
+        StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+        String resource = "createPolicy";
+        if (updateFlag) {
+            resource = "updatePolicy";
+        }
+        String body = null;
+        // Create Request.
         try {
             body = PolicyUtils.objectToJsonString(policyParameters);
         } catch (JsonProcessingException e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyException(message, e);
         }
-        // Get Response. 
+        // Get Response.
         try {
             ResponseEntity<String> result = callNewPDP(resource, HttpMethod.PUT, body, String.class);
             // Process response
@@ -506,30 +515,30 @@ public class StdPolicyEngine {
             return processException(exception);
         }
         return response;
-	}
-	
-	private PolicyChangeResponse processException(PolicyException exception) throws PolicyException {
-	    StdPolicyChangeResponse response = new StdPolicyChangeResponse();
-	    if(exception.getCause()!=null && exception.getCause() instanceof HttpClientErrorException){
+    }
+
+    private PolicyChangeResponse processException(PolicyException exception) throws PolicyException {
+        StdPolicyChangeResponse response = new StdPolicyChangeResponse();
+        if (exception.getCause() != null && exception.getCause() instanceof HttpClientErrorException) {
             LOGGER.error(exception);
             HttpClientErrorException ex = (HttpClientErrorException) exception.getCause();
             response.setResponseCode(ex.getRawStatusCode());
             response.setResponseMessage(exception.getMessage());
             return response;
-        }else{
-            String message = XACMLErrorConstants.ERROR_SYSTEM_ERROR+ "Error while processing results. please check logs.";
+        } else {
+            String message = XACMLErrorConstants.ERROR_SYSTEM_ERROR
+                    + "Error while processing results. please check logs.";
             LOGGER.error(message, exception);
             throw new PolicyException(message, exception);
         }
     }
 
-    public DecisionResponse getDecisionImpl(String onapName,
-											Map<String, String> decisionAttributes,
-											UUID requestID) throws PolicyDecisionException {
-		String resource= "getDecision";
-		StdDecisionResponse response = new StdDecisionResponse();
-        String body = new String();
-        // Create Request. 
+    public DecisionResponse getDecisionImpl(String onapName, Map<String, String> decisionAttributes, UUID requestID)
+            throws PolicyDecisionException {
+        String resource = "getDecision";
+        StdDecisionResponse response = new StdDecisionResponse();
+        String body = null;
+        // Create Request.
         try {
             DecisionRequestParameters decisionRequestParameters = new DecisionRequestParameters();
             decisionRequestParameters.setDecisionAttributes(decisionAttributes);
@@ -537,70 +546,77 @@ public class StdPolicyEngine {
             decisionRequestParameters.setRequestID(requestID);
             body = PolicyUtils.objectToJsonString(decisionRequestParameters);
         } catch (JsonProcessingException e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyDecisionException(message, e);
         }
-        // Get Response. 
+        // Get Response.
         try {
-            ResponseEntity<StdDecisionResponse> result = callNewPDP(resource, HttpMethod.POST, body, StdDecisionResponse.class);
+            ResponseEntity<StdDecisionResponse> result = callNewPDP(resource, HttpMethod.POST, body,
+                    StdDecisionResponse.class);
             // Process response
             response = result.getBody();
         } catch (Exception exception) {
-            if(exception.getCause().getMessage().contains("401")){
+            if (exception.getCause().getMessage().contains("401")) {
                 String message = XACMLErrorConstants.ERROR_PERMISSIONS + ERROR_AUTH_GET_PERM + resource;
                 LOGGER.error(message);
                 throw new PolicyDecisionException(message, exception);
-            }if(exception.getCause().getMessage().contains("400")){
+            }
+            if (exception.getCause().getMessage().contains("400")) {
                 String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Invalid Data is given.";
                 LOGGER.error(message);
                 throw new PolicyDecisionException(message, exception);
             }
-            String message = XACMLErrorConstants.ERROR_PERMISSIONS+ "Unable to get valid Response from  PDP(s) " + pdps;
+            String message = XACMLErrorConstants.ERROR_PERMISSIONS + "Unable to get valid Response from  PDP(s) "
+                    + pdps;
             LOGGER.error(message, exception);
             throw new PolicyDecisionException(message, exception);
         }
         return response;
-	}
-	
-    public Collection<PolicyConfig> getConfigImpl(ConfigRequestParameters configRequestParameters) throws PolicyConfigException{
-	    String resource= "getConfig";
-		ArrayList<PolicyConfig> response = new ArrayList<>();
-		String body = new String();
-		// Create Request. 
-		try {
+    }
+
+    public Collection<PolicyConfig> getConfigImpl(ConfigRequestParameters configRequestParameters)
+            throws PolicyConfigException {
+        String resource = "getConfig";
+        ArrayList<PolicyConfig> response = new ArrayList<>();
+        String body = null;
+        // Create Request.
+        try {
             body = PolicyUtils.objectToJsonString(configRequestParameters);
         } catch (JsonProcessingException e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyConfigException(message, e);
         }
-		// Get Response. 
-		try {
-            ResponseEntity<APIPolicyConfigResponse[]> result = callNewPDP(resource, HttpMethod.POST, body, APIPolicyConfigResponse[].class);
+        // Get Response.
+        try {
+            ResponseEntity<APIPolicyConfigResponse[]> result = callNewPDP(resource, HttpMethod.POST, body,
+                    APIPolicyConfigResponse[].class);
             // Process Response
             response = configResult(result.getBody());
         } catch (Exception exception) {
-            if(exception.getCause().getMessage().contains("401")){
+            if (exception.getCause().getMessage().contains("401")) {
                 String message = XACMLErrorConstants.ERROR_PERMISSIONS + ERROR_AUTH_GET_PERM + resource;
                 LOGGER.error(message);
                 throw new PolicyConfigException(message, exception);
-            }if(exception.getCause().getMessage().contains("400")){
+            }
+            if (exception.getCause().getMessage().contains("400")) {
                 String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Invalid Data is given.";
                 LOGGER.error(message);
                 throw new PolicyConfigException(message, exception);
             }
-            String message = XACMLErrorConstants.ERROR_PROCESS_FLOW+ "Unable to get valid Response from  PDP(s) " + pdps;
+            String message = XACMLErrorConstants.ERROR_PROCESS_FLOW + "Unable to get valid Response from  PDP(s) "
+                    + pdps;
             LOGGER.error(message, exception);
             throw new PolicyConfigException(message, exception);
         }
-		return response;
-	}
-    
+        return response;
+    }
+
     private ArrayList<PolicyConfig> configResult(APIPolicyConfigResponse[] response) throws PolicyConfigException {
         ArrayList<PolicyConfig> result = new ArrayList<>();
-        if(response!=null && response.length>0){
-            for(APIPolicyConfigResponse policyConfigResponse: response){
+        if (response != null && response.length > 0) {
+            for (APIPolicyConfigResponse policyConfigResponse : response) {
                 StdPolicyConfig policyConfig = new StdPolicyConfig();
                 policyConfig.setConfigStatus(policyConfigResponse.getPolicyConfigMessage());
                 policyConfig.setMatchingConditions(policyConfigResponse.getMatchingConditions());
@@ -610,11 +626,12 @@ public class StdPolicyEngine {
                 policyConfig.setPolicyVersion(policyConfigResponse.getPolicyVersion());
                 policyConfig.setResponseAttributes(policyConfigResponse.getResponseAttributes());
                 setMatches(policyConfig.getMatchingConditions());
-                if(policyConfigResponse.getType()!=null){
+                if (policyConfigResponse.getType() != null) {
                     try {
                         switch (policyConfigResponse.getType()) {
                             case JSON:
-                                JsonReader jsonReader = Json.createReader(new StringReader(policyConfigResponse.getConfig()));
+                                JsonReader jsonReader = Json
+                                        .createReader(new StringReader(policyConfigResponse.getConfig()));
                                 JsonObject object = jsonReader.readObject();
                                 jsonReader.close();
                                 policyConfig.setJsonObject(object);
@@ -631,12 +648,14 @@ public class StdPolicyEngine {
                                 DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
                                 DocumentBuilder builder;
                                 builder = factory.newDocumentBuilder();
-                                policyConfig.setDocument(builder.parse(new InputSource(new StringReader(policyConfigResponse.getConfig()))));
+                                policyConfig.setDocument(builder
+                                        .parse(new InputSource(new StringReader(policyConfigResponse.getConfig()))));
                                 break;
                         }
                     } catch (Exception e) {
-                        LOGGER.error(XACMLErrorConstants.ERROR_SCHEMA_INVALID+ e);
-                        throw new PolicyConfigException(XACMLErrorConstants.ERROR_SCHEMA_INVALID+ "Unable to parse the config", e);
+                        LOGGER.error(XACMLErrorConstants.ERROR_SCHEMA_INVALID + e);
+                        throw new PolicyConfigException(
+                                XACMLErrorConstants.ERROR_SCHEMA_INVALID + "Unable to parse the config", e);
                     }
                 }
                 result.add(policyConfig);
@@ -648,72 +667,74 @@ public class StdPolicyEngine {
     private void setMatches(Map<String, String> matchingConditions) {
         Matches match = new Matches();
         HashMap<String, String> configAttributes = new HashMap<>();
-        try{
-            for(String key: matchingConditions.keySet()){
-                if(key.equalsIgnoreCase("ONAPName")){
+        try {
+            for (String key : matchingConditions.keySet()) {
+                if (key.equalsIgnoreCase("ONAPName")) {
                     match.setOnapName(matchingConditions.get(key));
-                }else if(key.equalsIgnoreCase("ConfigName")){
+                } else if (key.equalsIgnoreCase("ConfigName")) {
                     match.setConfigName(matchingConditions.get(key));
-                }else{
+                } else {
                     configAttributes.put(key, matchingConditions.get(key));
                 }
             }
-            if(!configAttributes.isEmpty()){
+            if (!configAttributes.isEmpty()) {
                 match.setConfigAttributes(configAttributes);
             }
             MatchStore.storeMatch(match);
-        }catch(Exception e){
-            LOGGER.info("StoreMatch failed for Onap:"
-                    + match.getOnapName() + " Config: "
-                    + match.getConfigName());
+        } catch (Exception e) {
+            LOGGER.error("StoreMatch failed for Onap:" + match.getOnapName() + " Config: " + match.getConfigName(), e);
         }
     }
 
     /*
-     * Generic Rest Client to call PDP services. 
+     * Generic Rest Client to call PDP services.
      */
-    private <T> ResponseEntity<T> callNewPDP(String resource,
-            HttpMethod method, Object body, Class<T> responseType) throws PolicyException{
+    private <T> ResponseEntity<T> callNewPDP(String resource, HttpMethod method, Object body, Class<T> responseType)
+            throws PolicyException {
         RestTemplate restTemplate = new RestTemplate();
         HttpEntity<?> requestEntity = new HttpEntity<>(body, getHeaders());
         ResponseEntity<T> result = null;
         HttpClientErrorException exception = null;
         int pdpsCount = 0;
-        while(pdpsCount < pdps.size()){
-            try{
-                result = restTemplate.exchange(pdps.get(0)+"/api/" + resource, method, requestEntity, responseType);
-            }catch(HttpClientErrorException e){
+        while (pdpsCount < pdps.size()) {
+            try {
+                result = restTemplate.exchange(pdps.get(0) + "/api/" + resource, method, requestEntity, responseType);
+            } catch (HttpClientErrorException e) {
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while connecting to " + pdps.get(0), e);
                 exception = e;
-            }catch(Exception e){
+            } catch (Exception e) {
                 LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while connecting to " + pdps.get(0), e);
                 exception = new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage());
             }
-            if(result == null){
-        		Collections.rotate(pdps, -1);
-        		Collections.rotate(encoding, -1);
-        		pdpsCount++;
-        	}else{
-        		break;
-        	}
+            if (result == null) {
+                Collections.rotate(pdps, -1);
+                Collections.rotate(encoding, -1);
+                pdpsCount++;
+            } else {
+                break;
+            }
         }
-        if(exception != null && exception.getStatusCode()!=null){
-            if(exception.getStatusCode().equals(HttpStatus.UNAUTHORIZED)){
-                String message = XACMLErrorConstants.ERROR_PERMISSIONS +":"+exception.getStatusCode()+":" +ERROR_AUTH_GET_PERM + resource;
+        if (exception != null && exception.getStatusCode() != null) {
+            if (exception.getStatusCode().equals(HttpStatus.UNAUTHORIZED)) {
+                String message = XACMLErrorConstants.ERROR_PERMISSIONS + ":" + exception.getStatusCode() + ":"
+                        + ERROR_AUTH_GET_PERM + resource;
                 LOGGER.error(message);
                 throw new PolicyException(message, exception);
             }
-            if(exception.getStatusCode().equals(HttpStatus.BAD_REQUEST)){
-                String message = XACMLErrorConstants.ERROR_DATA_ISSUE + ":"+exception.getStatusCode()+":" + exception.getResponseBodyAsString();
+            if (exception.getStatusCode().equals(HttpStatus.BAD_REQUEST)) {
+                String message = XACMLErrorConstants.ERROR_DATA_ISSUE + ":" + exception.getStatusCode() + ":"
+                        + exception.getResponseBodyAsString();
                 LOGGER.error(message);
                 throw new PolicyException(message, exception);
             }
-            if(exception.getStatusCode().equals(HttpStatus.NOT_FOUND)){
-                String message = XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while connecting to " + pdps + exception;
+            if (exception.getStatusCode().equals(HttpStatus.NOT_FOUND)) {
+                String message = XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while connecting to " + pdps
+                        + exception;
                 LOGGER.error(message);
                 throw new PolicyException(message, exception);
             }
-            String message = XACMLErrorConstants.ERROR_PROCESS_FLOW + ":"+exception.getStatusCode()+":" + exception.getResponseBodyAsString();
+            String message = XACMLErrorConstants.ERROR_PROCESS_FLOW + ":" + exception.getStatusCode() + ":"
+                    + exception.getResponseBodyAsString();
             LOGGER.error(message);
             throw new PolicyException(message, exception);
         }
@@ -724,9 +745,9 @@ public class StdPolicyEngine {
         HttpHeaders headers = new HttpHeaders();
         headers.set("ClientAuth", "Basic " + clientEncoding);
         headers.set("Authorization", "Basic " + encoding.get(0));
-        if(contentType!=null){
+        if (contentType != null) {
             headers.set("Content-Type", contentType.toString());
-        }else{
+        } else {
             headers.set("Content-Type", MediaType.APPLICATION_JSON_VALUE);
         }
         headers.set("Environment", environment);
@@ -735,520 +756,558 @@ public class StdPolicyEngine {
 
     private void setClientEncoding() {
         Base64.Encoder encoder = Base64.getEncoder();
-        clientEncoding = encoder.encodeToString((userName+":"+pass).getBytes(StandardCharsets.UTF_8));
+        clientEncoding = encoder.encodeToString((userName + ":" + pass).getBytes(StandardCharsets.UTF_8));
+    }
+
+    public Collection<String> listConfigImpl(ConfigRequestParameters listRequestParameters)
+            throws PolicyConfigException {
+        Collection<String> policyList = new ArrayList<>();
+        if (junit) {
+            policyList.add("Policy Name: listConfigTest");
+            return policyList;
+        }
+        Collection<PolicyConfig> policyConfig = getConfigImpl(listRequestParameters);
+        for (PolicyConfig policy : policyConfig) {
+            if (policy.getPolicyConfigMessage() != null && policy.getPolicyConfigMessage().contains("PE300")) {
+                policyList.add(policy.getPolicyConfigMessage());
+            } else {
+                policyList.add("Policy Name: " + policy.getPolicyName());
+            }
+        }
+        return policyList;
     }
 
-    public Collection<String> listConfigImpl(ConfigRequestParameters listRequestParameters) throws PolicyConfigException{
-		Collection<String> policyList = new ArrayList<>();
-		if (junit){
-			policyList.add("Policy Name: listConfigTest");
-			return policyList;
-		}
-		Collection<PolicyConfig> policyConfig = getConfigImpl(listRequestParameters);
-		for(PolicyConfig policy : policyConfig){
-			if(policy.getPolicyConfigMessage()!=null && policy.getPolicyConfigMessage().contains("PE300")){
-				policyList.add(policy.getPolicyConfigMessage());
-			} else {
-				policyList.add("Policy Name: " + policy.getPolicyName());
-			}
-		}
-		return policyList;
-	}
-	
-	public Collection<PolicyResponse> sendEventImpl(Map<String, String> eventAttributes, UUID requestID) throws PolicyEventException {
-		String resource= "sendEvent";
+    public Collection<PolicyResponse> sendEventImpl(Map<String, String> eventAttributes, UUID requestID)
+            throws PolicyEventException {
+        String resource = "sendEvent";
         ArrayList<PolicyResponse> response = new ArrayList<PolicyResponse>();
         String body = new String();
-        // Create Request. 
+        // Create Request.
         try {
-            // Long way here, can be shortened and will be done. 
+            // Long way here, can be shortened and will be done.
             EventRequestParameters eventRequestParameters = new EventRequestParameters();
             eventRequestParameters.setEventAttributes(eventAttributes);
             eventRequestParameters.setRequestID(requestID);
             body = PolicyUtils.objectToJsonString(eventRequestParameters);
         } catch (JsonProcessingException e) {
-            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e; 
+            String message = XACMLErrorConstants.ERROR_SCHEMA_INVALID + e;
             LOGGER.error(message);
             throw new PolicyEventException(message, e);
         }
-        // Get Response. 
+        // Get Response.
         try {
-            ResponseEntity<StdPolicyResponse[]> result = callNewPDP(resource, HttpMethod.POST, body, StdPolicyResponse[].class);
+            ResponseEntity<StdPolicyResponse[]> result = callNewPDP(resource, HttpMethod.POST, body,
+                    StdPolicyResponse[].class);
             // Process Response
             response = eventResult(result.getBody());
         } catch (Exception exception) {
-            if(exception.getCause().getMessage().contains("401")){
+            if (exception.getCause().getMessage().contains("401")) {
                 String message = XACMLErrorConstants.ERROR_PERMISSIONS + ERROR_AUTH_GET_PERM + resource;
                 LOGGER.error(message);
                 throw new PolicyEventException(message, exception);
-            }if(exception.getCause().getMessage().contains("400")){
+            }
+            if (exception.getCause().getMessage().contains("400")) {
                 String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Invalid Data is given.";
                 LOGGER.error(message);
                 throw new PolicyEventException(message, exception);
             }
-            String message = XACMLErrorConstants.ERROR_PERMISSIONS+ "Unable to get valid Response from  PDP(s) " + pdps;
+            String message = XACMLErrorConstants.ERROR_PERMISSIONS + "Unable to get valid Response from  PDP(s) "
+                    + pdps;
             LOGGER.error(message, exception);
             throw new PolicyEventException(message, exception);
         }
         return response;
-	}
+    }
 
-	private ArrayList<PolicyResponse> eventResult(StdPolicyResponse[] response) throws PolicyEventException{
+    private ArrayList<PolicyResponse> eventResult(StdPolicyResponse[] response) throws PolicyEventException {
         ArrayList<PolicyResponse> eventResult = new ArrayList<>();
-        if(response!=null && response.length>0){
-            for(StdPolicyResponse policyConfigResponse: response){
+        if (response != null && response.length > 0) {
+            for (StdPolicyResponse policyConfigResponse : response) {
                 eventResult.add(policyConfigResponse);
             }
         }
         return eventResult;
     }
 
-	private void setProperty(String propertyFilePath, String clientKey)
-			throws PolicyEngineException {
-		this.propertyFilePath = propertyFilePath;
-		if (this.propertyFilePath == null) {
-			throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE + "Error NO PropertyFile Path provided");
-		} else {
-			// Adding logic for remote Properties file.
-			Properties prop = new Properties();
-			if (propertyFilePath.startsWith("http")) {
-				URL configURL;
-				try {
-					configURL = new URL(propertyFilePath);
-					URLConnection connection = null;
-					connection = configURL.openConnection();
-					prop.load(connection.getInputStream());
-				} catch (IOException e) {
-					LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + e);
-					throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE + "Maformed property URL "+ e.getMessage());
-				}
-			} else {
-				Path file = Paths.get(propertyFilePath);
-				if (Files.notExists(file)) {
-					throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE + "File doesn't exist in the specified Path "	+ file.toString());
-				} 
-				if (file.toString().endsWith(".properties")) {
-					InputStream in;
-					prop = new Properties();
-					try {
-						in = new FileInputStream(file.toFile());
-						prop.load(in);
-					} catch (IOException e) {
-						LOGGER.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + e);
-						throw new PolicyEngineException(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Cannot Load the Properties file", e);
-					}
-				} else {
-					LOGGER.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Not a .properties file " + propertyFilePath);
-					throw new PolicyEngineException(XACMLErrorConstants.ERROR_SYSTEM_ERROR  + "Not a .properties file");
-				}
-			}
-			// UEB and DMAAP Settings
-			String check_type = prop.getProperty("NOTIFICATION_TYPE");
-			String serverList = prop.getProperty("NOTIFICATION_SERVERS");
-			topic = prop.getProperty("NOTIFICATION_TOPIC");
-			apiKey = prop.getProperty("UEB_API_KEY");
-			apiSecret = prop.getProperty("UEB_API_SECRET");
-			
-			if(check_type==null) {
-				notificationType.add(DEFAULT_NOTIFICATION);
-				LOGGER.info("Properties file doesn't have the NOTIFICATION_TYPE parameter system will use defualt websockets");	
-			}else{
-				check_type = check_type.trim();
-				if(check_type.contains(",")) {
-					typeDefault = new ArrayList<String>(Arrays.asList(prop.getProperty("NOTIFICATION_TYPE").split(",")));
-					notificationType = typeDefault; 
-				} else {
-						notificationType = new ArrayList<>();
-						notificationType.add(check_type);
-				}
-			}
-			if(serverList==null) {
-				notificationType.clear();
-				notificationType.add(DEFAULT_NOTIFICATION);
-				LOGGER.info("Properties file doesn't have the NOTIFICATION_SERVERS parameter system will use defualt websockets");	
-			}else{
-				serverList = serverList.trim();
-				if(serverList.contains(",")) {
-					notificationURLList = new ArrayList<String>(Arrays.asList(serverList.split(","))); 
-				} else {
-					notificationURLList = new ArrayList<>();
-					notificationURLList.add(serverList);
-				}
-			}
-			
-			if(topic!=null) {
-				topic = topic.trim();
-			} else {
-				LOGGER.error("Properties file doesn't have the NOTIFICATION_TOPIC parameter.");
-			}
-			
-			// Client ID Authorization Settings. 
-			String clientID = prop.getProperty("CLIENT_ID");
-			if(clientKey==null){
-				clientKey = prop.getProperty("CLIENT_KEY");
-				try {
-					clientKey = PolicyUtils.decode(clientKey);
-				} catch (UnsupportedEncodingException|IllegalArgumentException e) {
-					LOGGER.error(XACMLErrorConstants.ERROR_PERMISSIONS+" Cannot Decode the given Password Proceeding with given Password!!");
-				}
-			}
-			if(clientID ==null || clientKey == null || clientID.isEmpty() || clientKey.isEmpty()){
-				LOGGER.error(XACMLErrorConstants.ERROR_PERMISSIONS+" Cannot proceed without the CLIENT_KEY and CLIENT_ID values !!");
-				throw new PolicyEngineException(XACMLErrorConstants.ERROR_PERMISSIONS+ " Cannot proceed without the CLIENT_KEY and CLIENT_ID values !!");
-			}else{
-				userName = clientID.trim();
-				pass = clientKey.trim();
-			}
-			setClientEncoding();
-			environment = prop.getProperty("ENVIRONMENT", AAFEnvironment.DEVL.toString());
-			if(environment.equalsIgnoreCase(AAFEnvironment.TEST.toString())){
-				environment = AAFEnvironment.TEST.toString();
-			}else if(environment.equalsIgnoreCase(AAFEnvironment.PROD.toString())){
-				environment = AAFEnvironment.PROD.toString();
-			}else{
-				environment = AAFEnvironment.DEVL.toString();
-			}
-			// Initializing the values.
-			pdps = new ArrayList<>();
-			encoding = new ArrayList<>();
-			// Check the Keys for PDP_URLs
-			Collection<Object> unsorted = prop.keySet();
-			@SuppressWarnings({ "rawtypes", "unchecked" })
-			List<String> sorted = new ArrayList(unsorted);
-			Collections.sort(sorted);
-			for (String propKey : sorted) {
-				if (propKey.startsWith("PDP_URL")) {
-					String check_val = prop.getProperty(propKey);
-					if (check_val == null) {
-						throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE + "Properties file doesn't have the PDP_URL parameter");
-					}
-					if (check_val.contains(";")) {
-						pdpDefault = new ArrayList<String>(Arrays.asList(check_val.split("\\s*;\\s*")));
-						int pdpCount = 0;
-						while (pdpCount < pdpDefault.size()) {
-							String pdpVal = pdpDefault.get(pdpCount);
-							readPDPParam(pdpVal);
-							pdpCount++;
-						}
-					} else {
-						readPDPParam(check_val);
-					}
-				}
-			}
-			if (pdps == null || pdps.isEmpty()) {
-				LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot Proceed without PDP_URLs");
-				throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot Proceed without PDP_URLs");
-			}
-			
-			// Get JUNIT property from properties file when running tests
-			String junit = prop.getProperty("JUNIT");
-			if(junit == null || junit.isEmpty()){
-				LOGGER.info("No JUNIT property provided, this will not be executed as a test.");
-			}else{
-				if(junit.equalsIgnoreCase("test")){
-					StdPolicyEngine.junit = true;
-				} else {
-					StdPolicyEngine.junit = false;
-				}
-			}
-		}
-	}
-	
-	/*
-	 * Read the PDP_URL parameter
-	 */
-	private void readPDPParam(String pdpVal) throws PolicyEngineException{
-		if(pdpVal.contains(",")){
-			List<String> pdpValues = new ArrayList<String>(Arrays.asList(pdpVal.split("\\s*,\\s*")));
-			if(pdpValues.size()==3){
-				// 0 - PDPURL
-				pdps.add(pdpValues.get(0));
-				// 1:2 will be UserID:Password
-				String userID = pdpValues.get(1);
-				String pass = pdpValues.get(2);
-				Base64.Encoder encoder = Base64.getEncoder();
-				encoding.add(encoder.encodeToString((userID+":"+pass).getBytes(StandardCharsets.UTF_8)));
-			}else{
-				LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "No Credentials to send Request: " + pdpValues);
-				throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE + "No enough Credentials to send Request. " + pdpValues);
-			}
-		}else{
-			LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "PDP value is improper/missing required values: " + pdpVal);
-			throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE + "PDP value is improper/missing required values.");
-		}
-	}
-	/*
-	 * Allowing changes to the scheme and Handler.
-	 */
-	public void notification(NotificationScheme scheme, NotificationHandler handler) {
-		this.scheme = scheme;
-		this.handler = handler;
-		LOGGER.debug("Scheme is : " + scheme.toString());
-		LOGGER.debug("Handler is : " + handler.getClass().getName());
-				
-		if (notificationType.get(0).equals("ueb")){
-			if (this.uebThread) {
-				uebClientThread.setAuto(scheme, handler);
-				this.uebThread = registerUEBThread.isAlive();
-			}
-		} else if (notificationType.get(0).equals("dmaap")){
-			if (this.dmaapThread) {
-				dmaapClientThread.setAuto(scheme, handler);
-				this.dmaapThread = registerDMAAPThread.isAlive();
-			}
-		} else {
-			AutoClientEnd.setAuto(scheme, handler);
-		}
-		
-		if(junit){
-		    return;
-		}
-		
-		if(pdps!=null){
-			if (notificationType.get(0).equals("ueb")  && !this.uebThread){
-				this.uebClientThread = new AutoClientUEB(pdps.get(0), notificationURLList, apiKey, apiSecret); 
-				this.uebClientThread.setAuto(scheme, handler);
-				this.registerUEBThread = new Thread(this.uebClientThread);
-				this.registerUEBThread.start();
-				this.uebThread = true;
-			}else if (notificationType.get(0).equals("dmaap") && !this.dmaapThread){
-				this.dmaapClientThread = new AutoClientDMAAP(notificationURLList,topic,userName,pass);
-				this.dmaapClientThread.setAuto(scheme, handler);
-				this.registerDMAAPThread = new Thread(this.dmaapClientThread);
-				this.registerDMAAPThread.start();
-				this.dmaapThread = true;
-			}else{
-				if(pdps.get(0)!=null){
-					if(AutoClientEnd.getURL()==null){
-						AutoClientEnd.start(pdps.get(0));
-					}else {
-						AutoClientEnd.stop();
-						AutoClientEnd.start(pdps.get(0));
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * Gets the Notification if one exists. Used only for Manual Polling
-	 * purposes.
-	 */
-	public PDPNotification getNotification(){
-		//Check if there is proper scheme.. 
-		PDPNotification notification = null;
-		if(this.scheme.equals(NotificationScheme.MANUAL_ALL_NOTIFICATIONS) || this.scheme.equals(NotificationScheme.MANUAL_NOTIFICATIONS)) {
-			if (notificationType.get(0).equals("ueb")){
-				ManualClientEndUEB.start(pdps.get(0), notificationURLList, UNIQUEID);
-				notification = ManualClientEndUEB.result(scheme);
-			}else if (notificationType.get(0).equals("dmaap")){
-				ManualClientEndDMAAP.start(notificationURLList, topic, UNIQUEID, userName, pass);
-				notification = ManualClientEndDMAAP.result(scheme);
-			}else{
-				ManualClientEnd.start(pdps.get(0));
-				LOGGER.debug("manual notification requested.. : " + scheme.toString());
-				notification = ManualClientEnd.result(scheme);
-			}
-			if (notification == null){
-				LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "No Notification yet..");
-				return null;
-			} else {
-				return notification;
-			}
-		}else {
-			return null;
-		}
-	}
-
-	/*
-	 * Setting the Scheme.
-	 */
-	public void setScheme(NotificationScheme scheme) {
-		this.scheme = scheme;
-		if (notificationType.get(0).equals("ueb")){
-			AutoClientUEB.setScheme(this.scheme);
-			if (this.scheme.equals(NotificationScheme.MANUAL_ALL_NOTIFICATIONS)){
-				ManualClientEndUEB.createTopic(pdps.get(0), UNIQUEID, notificationURLList);
-			}
-		}else if (notificationType.get(0).equals("dmaap")){
-			AutoClientDMAAP.setScheme(this.scheme);
-			if (this.scheme.equals(NotificationScheme.MANUAL_ALL_NOTIFICATIONS)){
-				ManualClientEndDMAAP.createTopic(topic, UNIQUEID, notificationURLList, userName, pass);
-			}
-		}else{
-			AutoClientEnd.setScheme(this.scheme);
-		}	
-	}
-
-	/*
-	 * Returns the Scheme
-	 */
-	public NotificationScheme getScheme() {
-		return this.scheme;
-	}
-
-	/*
-	 * Returns the NotificationHandler
-	 */
-	public NotificationHandler getNotificationHandler() {
-		return this.handler;
-	}
-
-	/*
-	 * Stop the Notification Service if its running.
-	 */
-	public void stopNotification() {
-		if (this.scheme != null && this.handler != null) {
-			if (this.scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS)
-					|| this.scheme
-							.equals(NotificationScheme.AUTO_NOTIFICATIONS)) {
-				LOGGER.info("Clear Notification called.. ");
-				if (notificationType.get(0).equals("ueb")){
-					this.uebClientThread.terminate();
-					this.uebThread = false;
-				}else if (notificationType.get(0).equals("dmaap")){
-					this.dmaapClientThread.terminate();
-					this.dmaapThread = false;
-				}else{
-					AutoClientEnd.stop();
-				}
-			}
-		}
-	}
-	
-	/*
-	 * Push a policy to the PDP API implementation
-	 */
-	public String pushPolicy(String policyScope, String policyName, String policyType, String pdpGroup, UUID requestID) throws PolicyException {
-		PushPolicyParameters pushPolicyParameters = new PushPolicyParameters();
-		if(policyScope==null|| policyScope.trim().isEmpty()){
-			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Scope given.";
-			LOGGER.error(message);
-			throw new PolicyException(message);
-		}
-		if(policyName==null|| policyName.trim().isEmpty()){
-			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Name given.";
-			LOGGER.error(message);
-			throw new PolicyException(message);
-		}
-		pushPolicyParameters.setPolicyName(policyScope+"."+policyName);
-		pushPolicyParameters.setPolicyType(policyType);
-		pushPolicyParameters.setPdpGroup(pdpGroup);
-		pushPolicyParameters.setRequestID(requestID);
-		return pushPolicyImpl(pushPolicyParameters).getResponseMessage();
-	}
-	
-	public String createUpdateConfigPolicy(String policyName, String policyDescription, String onapName, String configName,
-			Map<String, String> configAttributes, String configType, String body, String policyScope, UUID requestID,
-			String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag) throws PolicyException {
-		return createUpdateConfigPolicyImpl(policyName, policyDescription, onapName, configName,
-				configAttributes, configType, body, policyScope, requestID,
-				riskLevel, riskType, guard, ttlDate, updateFlag);
-	}
-	
-	/*
-	 * Create Config Policy API Implementation
-	 */
-	public String createUpdateConfigPolicyImpl(String policyName, String policyDescription, String onapName, String configName,
-			Map<String, String> configAttributes, String configType, String body, String policyScope, UUID requestID,
-			String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag) throws PolicyException {
-		PolicyParameters policyParameters = new PolicyParameters();
-		policyParameters.setPolicyClass(PolicyClass.Config);
-		policyParameters.setPolicyConfigType(PolicyConfigType.Base);
-		if(policyScope==null|| policyScope.trim().isEmpty()){
-			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Scope given.";
-			LOGGER.error(message);
-			throw new PolicyException(message);
-		}
-		if(policyName==null|| policyName.trim().isEmpty()){
-			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Name given.";
-			LOGGER.error(message);
-			throw new PolicyException(message);
-		}
-		policyParameters.setPolicyName(policyScope+"."+policyName);
-		policyParameters.setPolicyDescription(policyDescription);
-		policyParameters.setOnapName(onapName);
-		policyParameters.setConfigName(configName);
-		Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
-		attributes.put(AttributeType.MATCHING, configAttributes);
-		policyParameters.setAttributes(attributes);
-		policyParameters.setConfigBodyType(PolicyType.valueOf(configType));
-		policyParameters.setConfigBody(body);
-		policyParameters.setRequestID(requestID);
-		policyParameters.setRiskLevel(riskLevel);
-		policyParameters.setRiskType(riskType);
-		policyParameters.setGuard(Boolean.parseBoolean(guard));
-		try {
-			policyParameters.setTtlDate(new SimpleDateFormat("dd-MM-yyyy").parse(ttlDate));
-		} catch (ParseException e) {
-			LOGGER.warn("Error Parsing date given " + ttlDate);
-			policyParameters.setTtlDate(null);
-		}
-		return createUpdatePolicyImpl(policyParameters, updateFlag).getResponseMessage();
-	}
-	
-	public String createUpdateConfigFirewallPolicy(String policyName, JsonObject firewallJson, String policyScope, UUID requestID,
-			String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag) throws PolicyException {
-		return createUpdateConfigFirewallPolicyImpl(policyName, firewallJson, policyScope, requestID,
-				riskLevel, riskType, guard, ttlDate, updateFlag);
-	}
-	
-	/*
-	 * Create Update Config Firewall Policy API implementation
-	 */
-	public String createUpdateConfigFirewallPolicyImpl(String policyName, JsonObject firewallJson, String policyScope, UUID requestID,
-			String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag) throws PolicyException {
-		PolicyParameters policyParameters = new PolicyParameters();
-		policyParameters.setPolicyClass(PolicyClass.Config);
-		policyParameters.setPolicyConfigType(PolicyConfigType.Firewall);
-		if(policyScope==null|| policyScope.trim().isEmpty()){
-			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Scope given.";
-			LOGGER.error(message);
-			throw new PolicyException(message);
-		}
-		if(policyName==null|| policyName.trim().isEmpty()){
-			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Name given.";
-			LOGGER.error(message);
-			throw new PolicyException(message);
-		}
-		policyParameters.setPolicyName(policyScope+"."+policyName);
-		policyParameters.setConfigBody(firewallJson.toString());
-		policyParameters.setRequestID(requestID);
-		policyParameters.setRiskLevel(riskLevel);
-		policyParameters.setRiskType(riskType);
-		policyParameters.setGuard(Boolean.parseBoolean(guard));
-		try {
-			policyParameters.setTtlDate(new SimpleDateFormat("dd-MM-yyyy").parse(ttlDate));
-		} catch (NullPointerException | ParseException e) {
-			LOGGER.warn("Error Parsing date given " + ttlDate);
-			policyParameters.setTtlDate(null);
-		}
-		return createUpdatePolicyImpl(policyParameters, updateFlag).getResponseMessage();
-	}
-	
-	public void setClientKey(String clientKey){
-		if(clientKey!=null && !clientKey.isEmpty()){
-			StdPolicyEngine.pass = clientKey;
-			setClientEncoding();
-		}
-	}
-	/*
-	 * Get the Environment. 
-	 */
-	public static String getEnvironment() {
-		return environment;
-	} 
-	/*
-	 * Rotate the PDP list upon WEBsocket Failures
-	 */
-	public static void rotatePDPList() {
-		Collections.rotate(pdps, -1);
-		Collections.rotate(encoding, -1);
-	}
-	/*
-	 * Get the latest PDP
-	 */
-	public static String getPDPURL() {
-		return pdps.get(0);
-	}
+    private void setProperty(String propertyFilePath, String clientKey) throws PolicyEngineException {
+        if (propertyFilePath == null) {
+            throw new PolicyEngineException(
+                    XACMLErrorConstants.ERROR_DATA_ISSUE + "Error NO PropertyFile Path provided");
+        } else {
+            // Adding logic for remote Properties file.
+            Properties prop = new Properties();
+            if (propertyFilePath.startsWith("http")) {
+                URL configURL;
+                try {
+                    configURL = new URL(propertyFilePath);
+                    URLConnection connection = null;
+                    connection = configURL.openConnection();
+                    prop.load(connection.getInputStream());
+                } catch (IOException e) {
+                    LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + e);
+                    throw new PolicyEngineException(
+                            XACMLErrorConstants.ERROR_DATA_ISSUE + "Maformed property URL " + e.getMessage());
+                }
+            } else {
+                Path file = Paths.get(propertyFilePath);
+                if (Files.notExists(file)) {
+                    throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE
+                            + "File doesn't exist in the specified Path " + file.toString());
+                }
+                if (file.toString().endsWith(".properties")) {
+                    InputStream in;
+                    prop = new Properties();
+                    try {
+                        in = new FileInputStream(file.toFile());
+                        prop.load(in);
+                    } catch (IOException e) {
+                        LOGGER.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + e);
+                        throw new PolicyEngineException(
+                                XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Cannot Load the Properties file", e);
+                    }
+                } else {
+                    LOGGER.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Not a .properties file " + propertyFilePath);
+                    throw new PolicyEngineException(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Not a .properties file");
+                }
+            }
+            // UEB and DMAAP Settings
+            String checkType = prop.getProperty("NOTIFICATION_TYPE");
+            String serverList = prop.getProperty("NOTIFICATION_SERVERS");
+            topic = prop.getProperty("NOTIFICATION_TOPIC");
+            apiKey = prop.getProperty("UEB_API_KEY");
+            apiSecret = prop.getProperty("UEB_API_SECRET");
+
+            if (checkType == null) {
+                notificationType.add(DEFAULT_NOTIFICATION);
+                LOGGER.info(
+                        "Properties file doesn't have the NOTIFICATION_TYPE parameter system will use defualt websockets");
+            } else {
+                checkType = checkType.trim();
+                if (checkType.contains(",")) {
+                    typeDefault = new ArrayList<>(Arrays.asList(prop.getProperty("NOTIFICATION_TYPE").split(",")));
+                    notificationType = typeDefault;
+                } else {
+                    notificationType = new ArrayList<>();
+                    notificationType.add(checkType);
+                }
+            }
+            if (serverList == null) {
+                notificationType.clear();
+                notificationType.add(DEFAULT_NOTIFICATION);
+                LOGGER.info(
+                        "Properties file doesn't have the NOTIFICATION_SERVERS parameter system will use defualt websockets");
+            } else {
+                serverList = serverList.trim();
+                if (serverList.contains(",")) {
+                    notificationURLList = new ArrayList<String>(Arrays.asList(serverList.split(",")));
+                } else {
+                    notificationURLList = new ArrayList<>();
+                    notificationURLList.add(serverList);
+                }
+            }
+
+            if (topic != null) {
+                topic = topic.trim();
+            } else {
+                LOGGER.error("Properties file doesn't have the NOTIFICATION_TOPIC parameter.");
+            }
+
+            // Client ID Authorization Settings.
+            String clientID = prop.getProperty("CLIENT_ID");
+            if (clientKey == null) {
+                clientKey = prop.getProperty("CLIENT_KEY");
+                try {
+                    clientKey = PolicyUtils.decode(clientKey);
+                } catch (UnsupportedEncodingException | IllegalArgumentException e) {
+                    LOGGER.error(XACMLErrorConstants.ERROR_PERMISSIONS
+                            + " Cannot Decode the given Password Proceeding with given Password!!", e);
+                }
+            }
+            if (clientID == null || clientKey == null || clientID.isEmpty() || clientKey.isEmpty()) {
+                LOGGER.error(XACMLErrorConstants.ERROR_PERMISSIONS
+                        + " Cannot proceed without the CLIENT_KEY and CLIENT_ID values !!");
+                throw new PolicyEngineException(XACMLErrorConstants.ERROR_PERMISSIONS
+                        + " Cannot proceed without the CLIENT_KEY and CLIENT_ID values !!");
+            } else {
+                setClientId(clientID.trim());
+                setClientKey(clientKey.trim());
+            }
+            setEnvironment(prop);
+            // Initializing the values.
+            init();
+            // Check the Keys for PDP_URLs
+            Collection<Object> unsorted = prop.keySet();
+            @SuppressWarnings({ "rawtypes", "unchecked" })
+            List<String> sorted = new ArrayList(unsorted);
+            Collections.sort(sorted);
+            for (String propKey : sorted) {
+                if (propKey.startsWith("PDP_URL")) {
+                    String checkVal = prop.getProperty(propKey);
+                    if (checkVal == null) {
+                        throw new PolicyEngineException(XACMLErrorConstants.ERROR_DATA_ISSUE
+                                + "Properties file doesn't have the PDP_URL parameter");
+                    }
+                    if (checkVal.contains(";")) {
+                        pdpDefault = new ArrayList<>(Arrays.asList(checkVal.split("\\s*;\\s*")));
+                        int pdpCount = 0;
+                        while (pdpCount < pdpDefault.size()) {
+                            String pdpVal = pdpDefault.get(pdpCount);
+                            readPDPParam(pdpVal);
+                            pdpCount++;
+                        }
+                    } else {
+                        readPDPParam(checkVal);
+                    }
+                }
+            }
+            if (pdps == null || pdps.isEmpty()) {
+                LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot Proceed without PDP_URLs");
+                throw new PolicyEngineException(
+                        XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot Proceed without PDP_URLs");
+            }
+            // Get JUNIT property from properties file when running tests
+            checkJunit(prop);
+        }
+    }
+
+    private static void checkJunit(Properties prop) {
+        String junitFlag = prop.getProperty("JUNIT");
+        if (junitFlag == null || junitFlag.isEmpty()) {
+            LOGGER.info("No JUNIT property provided, this will not be executed as a test.");
+        } else {
+            if (junitFlag.equalsIgnoreCase("test")) {
+                StdPolicyEngine.junit = true;
+            } else {
+                StdPolicyEngine.junit = false;
+            }
+        }
+    }
+
+    private static void init() {
+        pdps = new ArrayList<>();
+        encoding = new ArrayList<>();
+    }
+
+    private static void setEnvironment(Properties prop) {
+        environment = prop.getProperty("ENVIRONMENT", AAFEnvironment.DEVL.toString());
+        if (environment.equalsIgnoreCase(AAFEnvironment.TEST.toString())) {
+            environment = AAFEnvironment.TEST.toString();
+        } else if (environment.equalsIgnoreCase(AAFEnvironment.PROD.toString())) {
+            environment = AAFEnvironment.PROD.toString();
+        } else {
+            environment = AAFEnvironment.DEVL.toString();
+        }
+    }
+
+    private static void setClientId(String clientID) {
+        userName = clientID;
+    }
+
+    /*
+     * Read the PDP_URL parameter
+     */
+    private void readPDPParam(String pdpVal) throws PolicyEngineException {
+        if (pdpVal.contains(",")) {
+            List<String> pdpValues = new ArrayList<String>(Arrays.asList(pdpVal.split("\\s*,\\s*")));
+            if (pdpValues.size() == 3) {
+                // 0 - PDPURL
+                pdps.add(pdpValues.get(0));
+                // 1:2 will be UserID:Password
+                String userID = pdpValues.get(1);
+                String pass = pdpValues.get(2);
+                Base64.Encoder encoder = Base64.getEncoder();
+                encoding.add(encoder.encodeToString((userID + ":" + pass).getBytes(StandardCharsets.UTF_8)));
+            } else {
+                LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "No Credentials to send Request: " + pdpValues);
+                throw new PolicyEngineException(
+                        XACMLErrorConstants.ERROR_DATA_ISSUE + "No enough Credentials to send Request. " + pdpValues);
+            }
+        } else {
+            LOGGER.error(
+                    XACMLErrorConstants.ERROR_DATA_ISSUE + "PDP value is improper/missing required values: " + pdpVal);
+            throw new PolicyEngineException(
+                    XACMLErrorConstants.ERROR_DATA_ISSUE + "PDP value is improper/missing required values.");
+        }
+    }
+
+    /*
+     * Allowing changes to the scheme and Handler.
+     */
+    public void notification(NotificationScheme scheme, NotificationHandler handler) {
+        this.scheme = scheme;
+        this.handler = handler;
+        LOGGER.debug("Scheme is : " + scheme.toString());
+        LOGGER.debug("Handler is : " + handler.getClass().getName());
+
+        if (notificationType.get(0).equals("ueb")) {
+            if (this.uebThread) {
+                AutoClientUEB.setAuto(scheme, handler);
+                this.uebThread = registerUEBThread.isAlive();
+            }
+        } else if (notificationType.get(0).equals("dmaap")) {
+            if (this.dmaapThread) {
+                AutoClientDMAAP.setAuto(scheme, handler);
+                this.dmaapThread = registerDMAAPThread.isAlive();
+            }
+        } else {
+            AutoClientEnd.setAuto(scheme, handler);
+        }
+
+        if (junit) {
+            return;
+        }
+
+        if (pdps != null) {
+            if (notificationType.get(0).equals("ueb") && !this.uebThread) {
+                this.uebClientThread = new AutoClientUEB(pdps.get(0), notificationURLList, apiKey, apiSecret);
+                AutoClientUEB.setAuto(scheme, handler);
+                this.registerUEBThread = new Thread(this.uebClientThread);
+                this.registerUEBThread.start();
+                this.uebThread = true;
+            } else if (notificationType.get(0).equals("dmaap") && !this.dmaapThread) {
+                this.dmaapClientThread = new AutoClientDMAAP(notificationURLList, topic, userName, pass);
+                AutoClientDMAAP.setAuto(scheme, handler);
+                this.registerDMAAPThread = new Thread(this.dmaapClientThread);
+                this.registerDMAAPThread.start();
+                this.dmaapThread = true;
+            } else {
+                if (pdps.get(0) != null) {
+                    if (AutoClientEnd.getURL() == null) {
+                        AutoClientEnd.start(pdps.get(0));
+                    } else {
+                        AutoClientEnd.stop();
+                        AutoClientEnd.start(pdps.get(0));
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * Gets the Notification if one exists. Used only for Manual Polling purposes.
+     */
+    public PDPNotification getNotification() {
+        // Check if there is proper scheme..
+        PDPNotification notification = null;
+        if (this.scheme.equals(NotificationScheme.MANUAL_ALL_NOTIFICATIONS)
+                || this.scheme.equals(NotificationScheme.MANUAL_NOTIFICATIONS)) {
+            if (notificationType.get(0).equals("ueb")) {
+                ManualClientEndUEB.start(pdps.get(0), notificationURLList, UNIQUEID);
+                notification = ManualClientEndUEB.result(scheme);
+            } else if (notificationType.get(0).equals("dmaap")) {
+                ManualClientEndDMAAP.start(notificationURLList, topic, UNIQUEID, userName, pass);
+                notification = ManualClientEndDMAAP.result(scheme);
+            } else {
+                ManualClientEnd.start(pdps.get(0));
+                LOGGER.debug("manual notification requested.. : " + scheme.toString());
+                notification = ManualClientEnd.result(scheme);
+            }
+            if (notification == null) {
+                LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "No Notification yet..");
+                return null;
+            } else {
+                return notification;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    /*
+     * Setting the Scheme.
+     */
+    public void setScheme(NotificationScheme scheme) {
+        this.scheme = scheme;
+        if (notificationType.get(0).equals("ueb")) {
+            AutoClientUEB.setScheme(this.scheme);
+            if (this.scheme.equals(NotificationScheme.MANUAL_ALL_NOTIFICATIONS)) {
+                ManualClientEndUEB.createTopic(pdps.get(0), UNIQUEID, notificationURLList);
+            }
+        } else if (notificationType.get(0).equals("dmaap")) {
+            AutoClientDMAAP.setScheme(this.scheme);
+            if (this.scheme.equals(NotificationScheme.MANUAL_ALL_NOTIFICATIONS)) {
+                ManualClientEndDMAAP.createTopic(topic, UNIQUEID, notificationURLList, userName, pass);
+            }
+        } else {
+            AutoClientEnd.setScheme(this.scheme);
+        }
+    }
+
+    /*
+     * Returns the Scheme
+     */
+    public NotificationScheme getScheme() {
+        return this.scheme;
+    }
+
+    /*
+     * Returns the NotificationHandler
+     */
+    public NotificationHandler getNotificationHandler() {
+        return this.handler;
+    }
+
+    /*
+     * Stop the Notification Service if its running.
+     */
+    public void stopNotification() {
+        if (this.scheme != null && this.handler != null) {
+            if (this.scheme.equals(NotificationScheme.AUTO_ALL_NOTIFICATIONS)
+                    || this.scheme.equals(NotificationScheme.AUTO_NOTIFICATIONS)) {
+                LOGGER.info("Clear Notification called.. ");
+                if (notificationType.get(0).equals("ueb")) {
+                    this.uebClientThread.terminate();
+                    this.uebThread = false;
+                } else if (notificationType.get(0).equals("dmaap")) {
+                    this.dmaapClientThread.terminate();
+                    this.dmaapThread = false;
+                } else {
+                    AutoClientEnd.stop();
+                }
+            }
+        }
+    }
+
+    /*
+     * Push a policy to the PDP API implementation
+     */
+    public String pushPolicy(String policyScope, String policyName, String policyType, String pdpGroup, UUID requestID)
+            throws PolicyException {
+        PushPolicyParameters pushPolicyParameters = new PushPolicyParameters();
+        if (policyScope == null || policyScope.trim().isEmpty()) {
+            String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Scope given.";
+            LOGGER.error(message);
+            throw new PolicyException(message);
+        }
+        if (policyName == null || policyName.trim().isEmpty()) {
+            String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Name given.";
+            LOGGER.error(message);
+            throw new PolicyException(message);
+        }
+        pushPolicyParameters.setPolicyName(policyScope + "." + policyName);
+        pushPolicyParameters.setPolicyType(policyType);
+        pushPolicyParameters.setPdpGroup(pdpGroup);
+        pushPolicyParameters.setRequestID(requestID);
+        return pushPolicyImpl(pushPolicyParameters).getResponseMessage();
+    }
+
+    public String createUpdateConfigPolicy(String policyName, String policyDescription, String onapName,
+            String configName, Map<String, String> configAttributes, String configType, String body, String policyScope,
+            UUID requestID, String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag)
+            throws PolicyException {
+        return createUpdateConfigPolicyImpl(policyName, policyDescription, onapName, configName, configAttributes,
+                configType, body, policyScope, requestID, riskLevel, riskType, guard, ttlDate, updateFlag);
+    }
+
+    /*
+     * Create Config Policy API Implementation
+     */
+    public String createUpdateConfigPolicyImpl(String policyName, String policyDescription, String onapName,
+            String configName, Map<String, String> configAttributes, String configType, String body, String policyScope,
+            UUID requestID, String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag)
+            throws PolicyException {
+        PolicyParameters policyParameters = new PolicyParameters();
+        policyParameters.setPolicyClass(PolicyClass.Config);
+        policyParameters.setPolicyConfigType(PolicyConfigType.Base);
+        if (policyScope == null || policyScope.trim().isEmpty()) {
+            String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Scope given.";
+            LOGGER.error(message);
+            throw new PolicyException(message);
+        }
+        if (policyName == null || policyName.trim().isEmpty()) {
+            String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Name given.";
+            LOGGER.error(message);
+            throw new PolicyException(message);
+        }
+        policyParameters.setPolicyName(policyScope + "." + policyName);
+        policyParameters.setPolicyDescription(policyDescription);
+        policyParameters.setOnapName(onapName);
+        policyParameters.setConfigName(configName);
+        Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        policyParameters.setAttributes(attributes);
+        policyParameters.setConfigBodyType(PolicyType.valueOf(configType));
+        policyParameters.setConfigBody(body);
+        policyParameters.setRequestID(requestID);
+        policyParameters.setRiskLevel(riskLevel);
+        policyParameters.setRiskType(riskType);
+        policyParameters.setGuard(Boolean.parseBoolean(guard));
+        try {
+            policyParameters.setTtlDate(new SimpleDateFormat("dd-MM-yyyy").parse(ttlDate));
+        } catch (ParseException e) {
+            LOGGER.warn("Error Parsing date given " + ttlDate);
+            policyParameters.setTtlDate(null);
+        }
+        return createUpdatePolicyImpl(policyParameters, updateFlag).getResponseMessage();
+    }
+
+    public String createUpdateConfigFirewallPolicy(String policyName, JsonObject firewallJson, String policyScope,
+            UUID requestID, String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag)
+            throws PolicyException {
+        return createUpdateConfigFirewallPolicyImpl(policyName, firewallJson, policyScope, requestID, riskLevel,
+                riskType, guard, ttlDate, updateFlag);
+    }
+
+    /*
+     * Create Update Config Firewall Policy API implementation
+     */
+    public String createUpdateConfigFirewallPolicyImpl(String policyName, JsonObject firewallJson, String policyScope,
+            UUID requestID, String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag)
+            throws PolicyException {
+        PolicyParameters policyParameters = new PolicyParameters();
+        policyParameters.setPolicyClass(PolicyClass.Config);
+        policyParameters.setPolicyConfigType(PolicyConfigType.Firewall);
+        if (policyScope == null || policyScope.trim().isEmpty()) {
+            String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Scope given.";
+            LOGGER.error(message);
+            throw new PolicyException(message);
+        }
+        if (policyName == null || policyName.trim().isEmpty()) {
+            String message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Name given.";
+            LOGGER.error(message);
+            throw new PolicyException(message);
+        }
+        policyParameters.setPolicyName(policyScope + "." + policyName);
+        policyParameters.setConfigBody(firewallJson.toString());
+        policyParameters.setRequestID(requestID);
+        policyParameters.setRiskLevel(riskLevel);
+        policyParameters.setRiskType(riskType);
+        policyParameters.setGuard(Boolean.parseBoolean(guard));
+        try {
+            policyParameters.setTtlDate(new SimpleDateFormat("dd-MM-yyyy").parse(ttlDate));
+        } catch (NullPointerException | ParseException e) {
+            LOGGER.warn("Error Parsing date given " + ttlDate);
+            policyParameters.setTtlDate(null);
+        }
+        return createUpdatePolicyImpl(policyParameters, updateFlag).getResponseMessage();
+    }
+
+    public void setClientKey(String clientKey) {
+        if (clientKey != null && !clientKey.isEmpty()) {
+            StdPolicyEngine.pass = clientKey;
+            setClientEncoding();
+        }
+    }
+
+    /*
+     * Get the Environment.
+     */
+    public static String getEnvironment() {
+        return environment;
+    }
+
+    /*
+     * Rotate the PDP list upon WEBsocket Failures
+     */
+    public static void rotatePDPList() {
+        Collections.rotate(pdps, -1);
+        Collections.rotate(encoding, -1);
+    }
+
+    /*
+     * Get the latest PDP
+     */
+    public static String getPDPURL() {
+        return pdps.get(0);
+    }
 }
\ No newline at end of file