1 files changed, 78 insertions, 68 deletions

diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java
index 5edf04b4..9e2bfff7 100644
--- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java
+++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/uebhandler/MainUebHandler.java
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * 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.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the “License”);
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             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.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.portalapp.uebhandler;
 
@@ -26,7 +44,6 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 
 import org.openecomp.portalapp.portal.ueb.EPUebMsgTypes;
 import org.openecomp.portalapp.portal.utils.EPSystemProperties;
-import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
 import org.openecomp.portalsdk.core.onboarding.ueb.UebMsgTypes;
@@ -37,7 +54,6 @@ import org.springframework.stereotype.Component;
 
 import com.att.eelf.configuration.Configuration;
 
-
 //-------------------------------------------------------------------------
 // Listens for received UEB messages and handles the messages
 //
@@ -46,69 +62,63 @@ import com.att.eelf.configuration.Configuration;
 //       
 //-------------------------------------------------------------------------
 @Component("MainUebHandler")
-public class MainUebHandler 
-{
+public class MainUebHandler {
 	final DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MainUebHandler.class);
-	
-	ConcurrentLinkedQueue<UebMsg> inboxQueue = null;
-	
-	@Autowired 
-	FunctionalMenuHandler funcMenuHandler;
-	
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MainUebHandler.class);
+
+	private ConcurrentLinkedQueue<UebMsg> inboxQueue = null;
+
+	@Autowired
+	private FunctionalMenuHandler funcMenuHandler;
+
 	@Autowired
-	WidgetNotificationHandler widgetNotificationHandler;
+	private WidgetNotificationHandler widgetNotificationHandler;
 
 	@Async
-	public void runHandler(ConcurrentLinkedQueue<UebMsg> queue)
-	{
+	public void runHandler(ConcurrentLinkedQueue<UebMsg> queue) {
 		inboxQueue = queue;
-    	logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "==> MainUebHandler started");
-		while (true)
-		{
+		logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "==> MainUebHandler started");
+		while (true) {
 			UebMsg msg = null;
-		    while ((msg = inboxQueue.poll()) != null) 
-		    {
-		    	if ((msg.getMsgType() != null) && (!msg.getMsgType().equalsIgnoreCase(EPUebMsgTypes.UEB_MSG_TYPE_HEALTH_CHECK)))
-		    	{
-		    	    // TODO: switch this back to debug
-		    	    logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) +  "<== Received UEB message : " + msg.toString());
-		    	    logger.info(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "<== Received UEB message : " + msg.toString());
-		    	    MDC.put(EPSystemProperties.PARTNER_NAME, msg.getSourceTopicName());
-		    	    MDC.put(Configuration.MDC_SERVICE_NAME, msg.getMsgType().toString());
-		    	    switch(msg.getMsgType())
-		    	    {
-		    	        case UebMsgTypes.UEB_MSG_TYPE_GET_FUNC_MENU:
-		    	        {
-		    	        	funcMenuHandler.getFunctionalMenu(msg);
-		    	            break;
-		    	        }		    	    
-		    	        case UebMsgTypes.UEB_MSG_TYPE_WIDGET_NOTIFICATION:
-		    	        {
-		    	    	    widgetNotificationHandler.handleWidgetNotification(msg);
-		    	            break;
-		    	        }
-		    	        default:
-		    	        {	
-  				    	    logger.info(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) +  "Unknown UEB message type " + msg.toString());
-		    	    	    break;
-		    	        }
-		    	    }
-		    	}
-	        }
-		    
-		    if (Thread.interrupted())
-		    {
-		    	logger.info(EELFLoggerDelegate.errorLogger, "==> UebMainHandler exiting");
-		    	break;
-		    }
-		    
-		    try {
-				Thread.sleep(10);  
+			while ((msg = inboxQueue.poll()) != null) {
+				if ((msg.getMsgType() != null)
+						&& (!msg.getMsgType().equalsIgnoreCase(EPUebMsgTypes.UEB_MSG_TYPE_HEALTH_CHECK))) {
+					// TODO: switch this back to debug
+					logger.info(EELFLoggerDelegate.errorLogger,
+							dateFormat.format(new Date()) + "<== Received UEB message : " + msg.toString());
+					logger.info(EELFLoggerDelegate.debugLogger,
+							dateFormat.format(new Date()) + "<== Received UEB message : " + msg.toString());
+					MDC.put(EPSystemProperties.PARTNER_NAME, msg.getSourceTopicName());
+					MDC.put(Configuration.MDC_SERVICE_NAME, msg.getMsgType().toString());
+					switch (msg.getMsgType()) {
+					case UebMsgTypes.UEB_MSG_TYPE_GET_FUNC_MENU: {
+						funcMenuHandler.getFunctionalMenu(msg);
+						break;
+					}
+					case UebMsgTypes.UEB_MSG_TYPE_WIDGET_NOTIFICATION: {
+						widgetNotificationHandler.handleWidgetNotification(msg);
+						break;
+					}
+					default: {
+						logger.info(EELFLoggerDelegate.debugLogger,
+								dateFormat.format(new Date()) + "Unknown UEB message type " + msg.toString());
+						break;
+					}
+					}
+				}
+			}
+
+			if (Thread.interrupted()) {
+				logger.info(EELFLoggerDelegate.errorLogger, "==> UebMainHandler exiting");
+				break;
+			}
+
+			try {
+				Thread.sleep(10);
 			} catch (InterruptedException e) {
-				logger.error(EELFLoggerDelegate.errorLogger, "UebMainHandler interrupted during sleep" + EcompPortalUtils.getStackTrace(e));
+				logger.error(EELFLoggerDelegate.errorLogger, "runHandler interrupted during sleep", e);
 			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred during sleep" + EcompPortalUtils.getStackTrace(e));
+				logger.error(EELFLoggerDelegate.errorLogger, "runHandler failed", e);
 			}
 		}
 	}