1 files changed, 54 insertions, 43 deletions

diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java
index 2ba27549..db60c89f 100644
--- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java
+++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/uebhandler/InitUebHandler.java
@@ -1,38 +1,49 @@
 /*-
- * ================================================================================
- * 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;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import javax.annotation.PostConstruct;
-
-import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
-import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
-import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
 import org.openecomp.portalsdk.core.onboarding.ueb.UebManager;
 import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
 
 //
 // Adding this class for the sole purpose of insuring that the MainUebHandler really 
@@ -43,33 +54,33 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 //@EnableAspectJAutoProxy
 //@EPMetricsLog
 public class InitUebHandler {
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(InitUebHandler.class);
-	
-	//@Autowired
-	MainUebHandler mainUebHandler;
-	
-	public InitUebHandler()	{
-	
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(InitUebHandler.class);
+
+	// @Autowired
+	private MainUebHandler mainUebHandler;
+
+	public InitUebHandler() {
+
 	}
-	
-	//@PostConstruct
-	public void initUeb()	{
-		
+
+	// @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.errorLogger, "Returned from initiating mainUebHandler...");
-  	        }
-		    else {
-		    	logger.info(EELFLoggerDelegate.errorLogger, "Not starting UEB listening thread because ueb_listeners_enable is not set to true in the properties file.");
-		    }
-		}
-		catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
-			logger.info(EELFLoggerDelegate.errorLogger, "Not starting UEB listening thread because property could not be read " + PortalApiConstants.UEB_LISTENERS_ENABLE + e.getMessage());
+				ConcurrentLinkedQueue<UebMsg> inboxQueue = new ConcurrentLinkedQueue<UebMsg>();
+				UebManager.getInstance().initListener(inboxQueue);
+				mainUebHandler.runHandler(inboxQueue);
+				logger.info(EELFLoggerDelegate.errorLogger, "Returned from initiating mainUebHandler...");
+			} else {
+				logger.info(EELFLoggerDelegate.errorLogger,
+						"Not starting UEB listening thread because ueb_listeners_enable is not set to true in the properties file.");
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "initUeb failed", e);
+			logger.info(EELFLoggerDelegate.errorLogger,
+					"Not starting UEB listening thread because property could not be read "
+							+ PortalApiConstants.UEB_LISTENERS_ENABLE + e.getMessage());
 		}
 	}
 }