[PORTAL-7] Rebase

This rebasing includes common libraries and common overlays projects
abstraction of components

Change-Id: Ia1efa4deacdc5701e6205104ac021a6c80ed60ba
Signed-off-by: st782s <statta@research.att.com>

2 files changed, 0 insertions, 247 deletions

diff --git a/ecomp-sdk/quantum/src/main/java/org/openecomp/portalsdk/core/web/socket/PeerBroadcastSocket.java b/ecomp-sdk/quantum/src/main/java/org/openecomp/portalsdk/core/web/socket/PeerBroadcastSocket.java
deleted file mode 100644
index ddf08c8f..00000000
--- a/ecomp-sdk/quantum/src/main/java/org/openecomp/portalsdk/core/web/socket/PeerBroadcastSocket.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.core.web.socket;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@ServerEndpoint("/contact")
-public class PeerBroadcastSocket {
-
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PeerBroadcastSocket.class);
-
-	public static Map<String, Object> channelMap = new Hashtable<String, Object>();
-	public Map<String, String> sessionMap = new Hashtable<String, String>();
-	ObjectMapper mapper = new ObjectMapper();
-
-	@OnMessage
-	public void message(String message, Session session) {
-		try {
-			// JSONObject jsonObject = new JSONObject(message);
-			@SuppressWarnings("unchecked")
-			Map<String, Object> jsonObject = mapper.readValue(message, Map.class);
-			try {
-				Object from = jsonObject.get("from");
-				if (from != null) {
-					channelMap.put(from.toString(), session);
-					sessionMap.put(session.getId(), from.toString());
-				}
-			} catch (Exception je) {
-				logger.error(EELFLoggerDelegate.errorLogger, "Failed to read value" + je.getMessage());
-			}
-
-			try {
-				Object to = jsonObject.get("to");
-				if (to == null)
-					return;
-				Object toSessionObj = channelMap.get(to);
-				if (toSessionObj != null) {
-					Session toSession = null;
-					toSession = (Session) toSessionObj;
-					toSession.getBasicRemote().sendText(message);
-				}
-
-			} catch (Exception ex) {
-				logger.error(EELFLoggerDelegate.errorLogger, "Failed to send text" + ex.getMessage());
-			}
-
-		} catch (Exception ex) {
-			logger.error(EELFLoggerDelegate.errorLogger, "Failed" + ex.getMessage());
-		}
-
-	}
-
-	@OnOpen
-	public void open(Session session) {
-		logger.info(EELFLoggerDelegate.debugLogger, "Channel opened");
-	}
-
-	@OnClose
-	public void close(Session session) {
-		String channel = sessionMap.get(session.getId());
-		if (channel != null) {
-			Object sessObj = channelMap.get(channel);
-			if (sessObj != null) {
-				try {
-					((Session) sessObj).close();
-				} catch (IOException e) {
-					logger.error(EELFLoggerDelegate.errorLogger, "Failed to close" + e.getMessage());
-				}
-			}
-			channelMap.remove(channel);
-		}
-		logger.info(EELFLoggerDelegate.debugLogger, "Channel closed");
-	}
-
-}
diff --git a/ecomp-sdk/quantum/src/main/java/org/openecomp/portalsdk/core/web/socket/WebRTCSocket.java b/ecomp-sdk/quantum/src/main/java/org/openecomp/portalsdk/core/web/socket/WebRTCSocket.java
deleted file mode 100644
index 810cba5c..00000000
--- a/ecomp-sdk/quantum/src/main/java/org/openecomp/portalsdk/core/web/socket/WebRTCSocket.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.core.web.socket;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@ServerEndpoint("/webrtc")
-public class WebRTCSocket {
-	
-	
-	   public static Map<String,Hashtable<String,Object[]>> channelMap = new Hashtable<String,Hashtable<String,Object[]>>();
-	   public  Map<String,String> sessionMap = new Hashtable<String,String>();
-	   ObjectMapper mapper = new ObjectMapper(); 
-
-	     
-		@OnMessage
-	     public void message(String message, Session session) {
-	    	 try {
-	    	 //JSONObject jsonObject = new JSONObject(message);
-	    	 @SuppressWarnings("unchecked")
-			 Map<String,Object> jsonObject = mapper.readValue(message, Map.class);
-		    	 try {
-		    	    Object isOpen = jsonObject.get("open");
-		    	    if(isOpen != null && (Boolean)isOpen == true) {
-		    		String channel = (String) jsonObject.get("channel");
-					Object value = channelMap.get(channel);
-					Hashtable<String,Object[]> sourceDestMap = null;
-		    		if(value == null) 
-		    			sourceDestMap = new Hashtable<String,Object[]>();
-		    		else
-		    			sourceDestMap = (Hashtable<String,Object[]>) value;
-		    		
-		    		sourceDestMap.put(session.getId(), new Object[]{session});
-		    		channelMap.put(channel, sourceDestMap);
-		    		sessionMap.put(session.getId(), channel);
-			    	
-		    		 		    		 
-		    	    }
-		    	 }
-				 catch (Exception je) {
-		    		 je.printStackTrace();
-		    	 }
-	    		 
-	    		 try{
-	    		 
-	    		 Object dataObj = jsonObject.get("data");
-	    		 if(dataObj == null)
-	    			 return;
-	    		 Map<String,Object> dataMapObj =  ( Map<String,Object>)dataObj; 
-	    		 //Object thisUserId = dataMapObj.get("userid");
-	    		 String channel = null;
-	    		 try{
-	    			 Object channelObj = dataMapObj.get("sessionid");
-	    			 if(channelObj != null)
-	    				 channel = (String) channelObj;
-	    			 else 
-	    				 channel = (String) jsonObject.get("channel");
-	    		 }
-	    		 catch(Exception json) {
-	    			 json.printStackTrace();
-	    		 }
-	    		 
-	    		/* 
-	    		 JSONObject dataMapObj =  (JSONObject)dataObj; 
-	    		 Object thisUserId = dataMapObj.get("userid");
-	    		 String channel = (String) dataMapObj.get("sessionid");
-	    		 Hashtable<String,Object> sourceDestMap = sessionMap.get(channel);
-	    		 
-				 if(thisUserId != null && sourceDestMap.get((String)thisUserId) == null) {
-	    			 sourceDestMap.put((String)thisUserId, new Object[] {message, session});
-	    		 }
-				 
-				 for(String userId : sourceDestMap.keySet()){
-					 if(!userId.equals(thisUserId)) {
-						 Session otherSession = (Session) ((Object[])sourceDestMap.get(userId))[1];
-						 otherSession.getBasicRemote().sendText(message);
-					 }
-				 }
-				 */
-	    		  
-	    		 Hashtable<String,Object[]> sourceDestMap = channelMap.get(channel);
-	    		 if(sourceDestMap != null)
-	    		 for(String id : sourceDestMap.keySet()){
-					 if(!id.equals(session.getId())) {
-						 Session otherSession = (Session) ((Object[])sourceDestMap.get(id))[0];
-						 if(otherSession.isOpen())
-							 otherSession.getBasicRemote().sendText(mapper.writeValueAsString(dataObj));
-					 }
-	    		 
-	    		 }
-	    		 }
-	    		 catch (Exception  je) {
-		    		 je.printStackTrace();
-		    	 }
-	    		 
-	    	 }
-	    	 catch (Exception  je) {
-	    		 je.printStackTrace();
-	    	 }
-	         //System.out.println("Message received:" + message);
-	     }
-	     
-	     @OnOpen
-	     public void open(Session session) {
-	         // System.out.println("Channel opened");
-	     }
-	     
-	     @OnClose
-	     public void close(Session session) {
-	    	 String channel = sessionMap.get(session.getId());
-	    	 if (channel != null) {
-	    		 channelMap.remove(channel); 
-	    	 }
-	    	 // System.out.println("Channel closed");
-	     }
-
-}