[VID-6] Initial rebase push

Change-Id: I9077be9663754d9b22f77c6a7b3109b361b39346
Signed-off-by: jimmydot <jf2512@att.com>

5 files changed, 0 insertions, 368 deletions

diff --git a/vid/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/vid/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
deleted file mode 100644
index f5f67b89..00000000
--- a/vid/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * 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.portalapp.service;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import org.openecomp.portalsdk.core.domain.User;
-
-/**
- * The Class AdminAuthExtension.
- */
-@Service("adminAuthExtension")
-@Transactional
-public class AdminAuthExtension {
-	
-	/**
-	 * Save user extension.
-	 *
-	 * @param user the user
-	 */
-	public void saveUserExtension(User user){
-		//app's developer implement their own logic here, like updating app's related tables
-	}
-
-}
diff --git a/vid/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java b/vid/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java
deleted file mode 100644
index 31c5882c..00000000
--- a/vid/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * 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.portalapp.uebhandler;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import javax.annotation.PostConstruct;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
-import org.openecomp.portalsdk.core.logging.format.AlarmSeverityEnum;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.crossapi.PortalApiConstants;
-import org.openecomp.portalsdk.core.onboarding.crossapi.PortalApiProperties;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebManager;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
-import org.openecomp.vid.conf.ExternalAppConfig;
-
-//
-// Adding this class for the sole purpose of insuring that the MainUebHandler really 
-// honors @Async and kicks off a thread.  For more info google @Async and read about
-// @Async only working if called from different class.
-/**
- * The Class InitUebHandler.
- */
-//
-@Configuration
-public class InitUebHandler {
-
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(InitUebHandler.class);
-
-	
-	/** The main ueb handler. */
-	@Autowired
-	MainUebHandler mainUebHandler;
-	
-	/**
-	 * Instantiates a new inits the ueb handler.
-	 */
-	public InitUebHandler()	{
-	
-	}
-	
-	/**
-	 * Inits the ueb.
-	 */
-	@PostConstruct
-	public void initUeb()	{
-		
-		try {
-			String enableListenerThread = PortalApiProperties.getProperty(PortalApiConstants.UEB_LISTENERS_ENABLE);
-			if (enableListenerThread.equalsIgnoreCase("true")) {
-                ConcurrentLinkedQueue<UebMsg> inboxQueue = new ConcurrentLinkedQueue<UebMsg>();
-	    	    UebManager.getInstance().initListener(inboxQueue);
-  		        mainUebHandler.runHandler(inboxQueue);
-				logger.info(EELFLoggerDelegate.debugLogger, ("Returned from initiating mainUebHandler..."));
-  	        }
-		    else {
-				logger.info(EELFLoggerDelegate.debugLogger, ("Not starting UEB listening thread because ueb_listeners_enable is not set to true in the properties file."));
-		    }
-		}
-		catch (Exception e) {
-			logger.error(EELFLoggerDelegate.debugLogger, ("Not starting UEB listening thread because property could not be read " + PortalApiConstants.UEB_LISTENERS_ENABLE),AlarmSeverityEnum.MAJOR);
-		}
-	
-	}
-}
-
diff --git a/vid/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java b/vid/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java
deleted file mode 100644
index 5b7f0e4a..00000000
--- a/vid/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * 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.portalapp.uebhandler;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebMsgTypes;
-
-//-------------------------------------------------------------------------
-// Listens for received UEB messages and handles the messages
-//
-// Note: To implement a synchronous reply call getMsgId on the request 
-//       and putMsgId on the reply (echoing the request MsgId).
-//       
-/**
- * The Class MainUebHandler.
- */
-//-------------------------------------------------------------------------
-@Component("MainUebHandler")
-public class MainUebHandler {
-
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MainUebHandler.class);
-
-
-	/** The inbox queue. */
-	ConcurrentLinkedQueue<UebMsg> inboxQueue = null;
-
-	/** The widget notification handler. */
-	@Autowired
-	WidgetNotificationHandler widgetNotificationHandler;
-
-	/**
-	 * Run handler.
-	 *
-	 * @param queue the queue
-	 */
-	@Async
-	public void runHandler(ConcurrentLinkedQueue<UebMsg> queue) {
-		inboxQueue = queue;
-
-		logger.info(EELFLoggerDelegate.debugLogger, ("==> MainUebHandler started"));
-
-		while (true) {
-			UebMsg msg = null;
-			while ((msg = inboxQueue.poll()) != null) {
-				if (msg.getMsgType() != null) {
-					logger.debug(EELFLoggerDelegate.debugLogger, ("<== Received UEB message : " + msg.toString()));
-
-					switch (msg.getMsgType()) {
-					/*
-					 * Add your own defined handler objects, use @Component for
-					 * the class. See WidgetNotificationHandler as an example.
-					 *
-					 * Use @Async on methods for performance
-					 *
-					 * For syncronous replies use UebManager publishReply and
-					 * echo back the msgId in your response ie
-					 * msg.putMsgId(requestMsg.getMsgId())
-					 *
-					 * case UebMsgTypes.UEB_MSG_TYPE_XYZ: {
-					 * XYZHandler.handleMsg(msg); break; }
-					 */
-					case UebMsgTypes.UEB_MSG_TYPE_WIDGET_NOTIFICATION: {
-						widgetNotificationHandler.handleWidgetNotification(msg);
-						break;
-					}
-					default: {
-						
-						logger.info(EELFLoggerDelegate.debugLogger, ("Unknown message type [" + msg.getMsgType() + "] from " + msg.getSourceTopicName()));
-
-						break;
-					}
-					}
-				}
-			}
-
-			if (Thread.interrupted()) {
-				
-				logger.info(EELFLoggerDelegate.debugLogger, ("==> UebMainHandler exiting"));
-
-				break;
-			}
-
-			try {
-				Thread.sleep(10);
-			} catch (InterruptedException e) {
-				logger.info(EELFLoggerDelegate.debugLogger, ("UebMainHandler interrupted during sleep" + e.getMessage()));
-
-			}
-		}
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/portalapp/uebhandler/WidgetNotificationHandler.java b/vid/src/main/java/org/openecomp/portalapp/uebhandler/WidgetNotificationHandler.java
deleted file mode 100644
index dba84d4a..00000000
--- a/vid/src/main/java/org/openecomp/portalapp/uebhandler/WidgetNotificationHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * 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.portalapp.uebhandler;
-
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
-
-
-/**
- * The Class WidgetNotificationHandler.
- */
-@Component
-public class WidgetNotificationHandler {
-
-	/** The logger. */
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetNotificationHandler.class);
-
-
-	/**
-	 * Instantiates a new widget notification handler.
-	 */
-	public WidgetNotificationHandler() {
-	}
-
-	/**
-	 * Handle widget notification.
-	 *
-	 * @param requestMsg the request msg
-	 */
-	@Async
-	public void handleWidgetNotification(UebMsg requestMsg) {
-		logger.debug(EELFLoggerDelegate.debugLogger, ("handleWidgetNotification received notification: " + requestMsg.toString()));
-		/*
-		 * Here the notification msg can be handled
-		 *
-		 * requestMsg.getPayload() - returns string that contains the
-		 * Application defined content
-		 */
-	}
-}
diff --git a/vid/src/main/java/org/openecomp/portalapp/util/CustomLoggingFilter.java b/vid/src/main/java/org/openecomp/portalapp/util/CustomLoggingFilter.java
deleted file mode 100644
index e4c87775..00000000
--- a/vid/src/main/java/org/openecomp/portalapp/util/CustomLoggingFilter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * 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.portalapp.util;
-
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.filter.Filter;
-import ch.qos.logback.core.spi.FilterReply;
-
-/**
- * Custom Filter class bind with logback.xml
- * configuration file to strip out certain log messages
- * coming out of special packages or classes.
- *
- */
-public class CustomLoggingFilter extends Filter<ILoggingEvent> {
-
-	/**
-	 * Custom Filter is added to strip out the continuous U-EB logging messages
-	 * But make sure we log the ERROR & WARNING Level messages.
-	 *
-	 * @param event the event
-	 * @return the filter reply
-	 */
-	@Override
-	public FilterReply decide(ILoggingEvent event) {
-		try {
-			if ((event.getLevel() != Level.ERROR || event.getLevel() != Level.WARN) && 
-				(event.getThreadName().equalsIgnoreCase("UEBConsumerThread")) &&
-				(event.getLoggerName().contains("org.openecomp.nsa") || event.getLoggerName().contains("org.apache.http"))
-				) {
-				return FilterReply.DENY;
-			} else {
-				return FilterReply.NEUTRAL;
-			}
-		} catch(Exception e) {
-			return FilterReply.NEUTRAL;
-		} 
-	}
-}