Policy 1707 commit to LF

Change-Id: Ibe6f01d92f9a434c040abb05d5386e89d675ae65
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

3 files changed, 0 insertions, 289 deletions

diff --git a/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/Notification.java b/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/Notification.java
deleted file mode 100644
index a1717c275..000000000
--- a/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/Notification.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pypdp.notifications;
-
-import java.util.Collection;
-
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.RemovedPolicy;
-
-public class Notification{
-	
-	private Collection<RemovedPolicy> removedPolicies = null;
-	private Collection<LoadedPolicy> loadedPolicies = null;
-	
-	public Collection<RemovedPolicy> getRemovedPolicies() {
-		return removedPolicies;
-	}
-
-	public Collection<LoadedPolicy> getLoadedPolicies() {
-		return loadedPolicies;
-	}
-
-	
-	public void setRemovedPolicies(Collection<RemovedPolicy> removedPolicies){
-		this.removedPolicies = removedPolicies;
-	}
-	
-	public void setLoadedPolicies(Collection<LoadedPolicy> loadedPolicies){
-		this.loadedPolicies = loadedPolicies;
-	}
-
-}
diff --git a/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/NotificationController.java b/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/NotificationController.java
deleted file mode 100644
index 0f2ed9b45..000000000
--- a/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/NotificationController.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pypdp.notifications;
-
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.api.LoadedPolicy;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.RemovedPolicy;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-
-public class NotificationController implements NotificationHandler{
-	private static final Log logger	= LogFactory.getLog(NotificationController.class);
-	private static Notification record = new Notification();
-	//private static CountDownLatch latch;
-	
-	@Override
-	public void notificationReceived(PDPNotification notification) {
-		//latch = new CountDownLatch(1);
-		if(notification!=null){
-			// Take this into our Record holder for polling requests. 
-			NotificationServer.setUpdate(record(notification));
-			// Send the Update as is for AUTO clients. 
-			ObjectWriter ow = new ObjectMapper().writer();
-			try{
-				String json = ow.writeValueAsString(notification);
-				System.out.println("\n Notification: "+json);
-				logger.info(json);
-				NotificationServer.sendNotification(json);
-				//latch.await();
-			} catch (JsonProcessingException e) {
-				logger.error(XACMLErrorConstants.ERROR_SCHEMA_INVALID + e.getMessage());
-				// TODO:EELF Cleanup - Remove logger
-				PolicyLogger.error(MessageCodes.ERROR_SCHEMA_INVALID, e, "");
-			}
-			
-		}
-	}
-	
-	public static String record(PDPNotification notification) {
-		// Initialization with updates. 
-		if(record.getRemovedPolicies()== null){
-			record.setRemovedPolicies(notification.getRemovedPolicies());
-		}
-		if(record.getLoadedPolicies()== null){
-			record.setLoadedPolicies(notification.getLoadedPolicies());
-		}
-		// Check if there is anything new and update the record..
-		if(record.getLoadedPolicies()!= null || record.getRemovedPolicies()!=null) {
-			HashSet<RemovedPolicy> removedPolicies = (HashSet<RemovedPolicy>) record.getRemovedPolicies();
-			HashSet<LoadedPolicy> updatedPolicies = (HashSet<LoadedPolicy>) record.getLoadedPolicies();
-			// Checking with New updated policies.
-			if(notification.getLoadedPolicies()!= null && !notification.getLoadedPolicies().isEmpty()) {
-				for( LoadedPolicy newUpdatedPolicy : notification.getLoadedPolicies()) {
-					// If it was removed earlier then we need to remove from our record
-					Iterator<RemovedPolicy> oldRemovedPolicy = removedPolicies.iterator();
-					while(oldRemovedPolicy.hasNext()){
-						RemovedPolicy policy = oldRemovedPolicy.next(); 
-						if(newUpdatedPolicy.getPolicyName().equals(policy.getPolicyName())) {
-							if(newUpdatedPolicy.getVersionNo().equals(policy.getVersionNo())) {
-								oldRemovedPolicy.remove();
-							}
-						}
-					}
-					// If it was previously updated need to Overwrite it to the record.
-					Iterator<LoadedPolicy> oldUpdatedPolicy = updatedPolicies.iterator();
-					while(oldUpdatedPolicy.hasNext()){
-						LoadedPolicy policy = oldUpdatedPolicy.next();
-						if(newUpdatedPolicy.getPolicyName().equals(policy.getPolicyName())) {
-							if(newUpdatedPolicy.getVersionNo().equals(policy.getVersionNo())) {
-								oldUpdatedPolicy.remove();
-							}
-						}
-					}
-					updatedPolicies.add(newUpdatedPolicy);
-				}
-			}
-			// Checking with New Removed policies.
-			if(notification.getRemovedPolicies()!= null && !notification.getRemovedPolicies().isEmpty()) {
-				for( RemovedPolicy newRemovedPolicy : notification.getRemovedPolicies()) {
-					// If it was removed earlier then we need to remove from our record
-					Iterator<RemovedPolicy> oldRemovedPolicy = removedPolicies.iterator();
-					while(oldRemovedPolicy.hasNext()){
-						RemovedPolicy policy = oldRemovedPolicy.next(); 
-						if(newRemovedPolicy.getPolicyName().equals(policy.getPolicyName())) {
-							if(newRemovedPolicy.getVersionNo().equals(policy.getVersionNo())) {
-								oldRemovedPolicy.remove();
-							}
-						}
-					}
-					// If it was previously updated need to Overwrite it to the record.
-					Iterator<LoadedPolicy> oldUpdatedPolicy = updatedPolicies.iterator();
-					while(oldUpdatedPolicy.hasNext()){
-						LoadedPolicy policy = oldUpdatedPolicy.next();
-						if(newRemovedPolicy.getPolicyName().equals(policy.getPolicyName())) {
-							if(newRemovedPolicy.getVersionNo().equals(policy.getVersionNo())) {
-								oldUpdatedPolicy.remove();
-							}
-						}
-					}
-					removedPolicies.add(newRemovedPolicy);
-				}
-			}
-			record.setRemovedPolicies(removedPolicies);
-			record.setLoadedPolicies(updatedPolicies);
-		}
-		// Send the Result to the caller. 
-		ObjectWriter om = new ObjectMapper().writer();
-		String json = null;
-		try {
-			json = om.writeValueAsString(record);
-		} catch (JsonProcessingException e) {
-			logger.error(XACMLErrorConstants.ERROR_SCHEMA_INVALID + e.getMessage());
-			// TODO:EELF Cleanup - Remove logger
-			PolicyLogger.error(MessageCodes.ERROR_SCHEMA_INVALID, e, "");
-		}
-		logger.info(json);
-		return json;
-	}
-
-}
diff --git a/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/NotificationServer.java b/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/NotificationServer.java
deleted file mode 100644
index 44324b55c..000000000
--- a/PyPDPServer/src/main/java/org/openecomp/policy/pypdp/notifications/NotificationServer.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pypdp.notifications;
-
-import java.io.IOException;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-
-
-@ServerEndpoint(value = "/org.openecomp.policy.pypdp.notifications")
-public class NotificationServer {
-	private static final Logger logger	= FlexLogger.getLogger(NotificationServer.class);
-	private static Queue<Session> queue = new ConcurrentLinkedQueue<Session>();
-	private static String update = null;
-	
-	@OnOpen
-	public void openConnection(Session session) {
-		logger.info("Session Connected: " + session.getId());
-		queue.add(session);
-	}
-	
-	@OnClose
-	public void closeConnection(Session session) {
-		queue.remove(session);
-	}
-	
-	@OnError
-	public void error(Session session, Throwable t) {
-		queue.remove(session);
-		logger.info(XACMLErrorConstants.ERROR_SYSTEM_ERROR+ "Session Error for : " + session.getId() + " Error: " + t.getMessage());
-		
-	}
-	
-	@OnMessage
-	public void Message(String message, Session session) {
-		if(message.equalsIgnoreCase("Manual")) {
-			try {
-				session.getBasicRemote().sendText(update);
-			} catch (IOException e) {
-				logger.info(XACMLErrorConstants.ERROR_SYSTEM_ERROR+ "Error in sending the Event Notification: "+ e.getMessage());
-			}
-		}
-	}
-	
-	public static void sendNotification(String notification){
-		for(Session session: queue) {
-			try {
-				session.getBasicRemote().sendText(notification);
-			} catch (IOException e) {
-				logger.info(XACMLErrorConstants.ERROR_SYSTEM_ERROR+ "Error in sending the Event Notification: "+ e.getMessage());
-			}
-		}
-	}
-	
-	public static void setUpdate(String update) {
-		NotificationServer.update = update;
-	}
-}
\ No newline at end of file