X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FWebAnalyticsExtAppController.java;h=41273ecf203de405ea70aee981d398a5da543fb4;hb=78b33155a14fd35d9c0db7b0fa91fdfd7573bfbb;hp=a3f4d301a435f5917b400ef786b88f93bf1483f6;hpb=255dcfbf8a0dfb7f5aa853d223425559411abf2a;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WebAnalyticsExtAppController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WebAnalyticsExtAppController.java
index a3f4d301..41273ecf 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WebAnalyticsExtAppController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WebAnalyticsExtAppController.java
@@ -96,11 +96,13 @@ public class WebAnalyticsExtAppController extends EPRestrictedRESTfulBaseControl
 	private static final String REGISTER_ACTION = MACHINE_LEARNING_SERVICE_CTX + "/" + "registerAction";
 	private static final String CONSUL_ML_SERVICE_ID = "machine-learning";
 	private static final String APP_KEY = "uebkey";
+	private static final String ERROR_MSG = " Error retrieving Application to capture app name for analytics; Proceeding with empty app name";
 	private final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WebAnalyticsExtAppController.class);
 	private final AsyncRestTemplate restTemplate = new AsyncRestTemplate();
 	private final SuccessCallback<ResponseEntity<String>> successCallback = arg -> logger.info(EELFLoggerDelegate.debugLogger, arg.getBody());
 	private final FailureCallback failureCallback = arg -> logger.error(EELFLoggerDelegate.errorLogger, "storeAuxAnalytics failed", arg);
 
+
 	@Autowired
 	public WebAnalyticsExtAppController(AppsCacheService appCacheService, WidgetMService consulHealthService) {
 		this.appCacheService = appCacheService;
@@ -124,8 +126,8 @@ public class WebAnalyticsExtAppController extends EPRestrictedRESTfulBaseControl
 		try {
 			app = getApp(request);
 		} catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger,
-					" Error retrieving Application to capture app name for analytics; Proceeding with empty app name");
+            logger.error(EELFLoggerDelegate.errorLogger,
+                    ERROR_MSG, e);
 		}
 		if (app != null) {
 			String restEndPoint = app.getAppRestEndpoint();
@@ -168,19 +170,19 @@ public class WebAnalyticsExtAppController extends EPRestrictedRESTfulBaseControl
 		try {
 			MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
 			String appName = "";
-			try {
-				appName = getAppName(request, appName);
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger,
-						" Error retrieving Application to capture app name for analytics; Proceeding with empty app name");
-			}
-
-			try {
-				storeAuxAnalytics(analyticsMap, appName);
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger,
-						" Error retrieving Application to capture app name for analytics; Proceeding with empty app name");
-			}
+            try {
+                appName = getAppName(request, appName);
+            } catch (Exception e) {
+                logger.error(EELFLoggerDelegate.errorLogger,
+                        ERROR_MSG, e);
+            }
+
+            try {
+                storeAuxAnalytics(analyticsMap, appName);
+            } catch (Exception e) {
+                logger.error(EELFLoggerDelegate.errorLogger,
+                        ERROR_MSG, e);
+            }
 
 			MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
 
@@ -216,7 +218,7 @@ public class WebAnalyticsExtAppController extends EPRestrictedRESTfulBaseControl
 	private EPApp getApp(HttpServletRequest request) {
 		String appKeyValue = request.getHeader(APP_KEY);
 		EPApp appRecord = null;
-		if (appKeyValue == null || appKeyValue.equals("")) {
+		if (appKeyValue == null || "".equals(appKeyValue)) {
 			logger.error(EELFLoggerDelegate.errorLogger, " App Key unavailable; Proceeding with null app name");
 		} else {
 			 appRecord = appCacheService.getAppFromUeb(appKeyValue);