1 files changed, 30 insertions, 29 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/FavoritesController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/FavoritesController.java
index 016c3b87..da26fe69 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/FavoritesController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/FavoritesController.java
@@ -6,7 +6,7 @@
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * 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
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * 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
  *
@@ -75,26 +75,25 @@ public class FavoritesController extends RestrictedBaseController {
 	private AppService appService;
 
 	/**
-	 * Makes the REST API call to Portal Back-end and retrieves Favorite menu
-	 * items for the currently logged in user.
+	 * Makes the REST API call to Portal Back-end and retrieves Favorite menu items
+	 * for the currently logged in user.
 	 * 
 	 * @param request
 	 * @param response
 	 */
 	@RequestMapping(value = { "/get_favorites" }, method = RequestMethod.GET)
 	public void getFavorites(HttpServletRequest request, HttpServletResponse response) {
-		String appName			= "";
-		String requestId 		= "";
-		String appUserName 		= "";
-		String decryptedPwd 	= "";
-		
+		String appName = "";
+		String requestId = "";
+		String appUserName = "";
+		String decryptedPwd = null;
+
 		try {
 			HttpSession session = request.getSession();
 			User user = (User) session.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME));
 			if (user == null || user.getId() == null) {
-				logger.info(EELFLoggerDelegate.errorLogger,
-						("Http request did not contain user info, cannot retrieve favorites."));
-
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"Http request did not contain user info, cannot retrieve favorites.");
 				response.setContentType("application/json");
 				JSONArray jsonResponse = new JSONArray();
 				JSONObject error = new JSONObject();
@@ -102,35 +101,37 @@ public class FavoritesController extends RestrictedBaseController {
 				jsonResponse.put(error);
 				response.getWriter().write(jsonResponse.toString());
 			} else {
-				logger.info(EELFLoggerDelegate.errorLogger,
+				logger.debug(EELFLoggerDelegate.debugLogger,
 						"Retrieving Favorites for the user '" + MDC.get(SystemProperties.MDC_LOGIN_ID) + "'.");
-				
+
 				App app = appService.getDefaultApp();
-				if (app!=null) {
-					appName	= app.getName();
+				if (app != null) {
+					appName = app.getName();
 					appUserName = app.getUsername();
-					try{
-						decryptedPwd = CipherUtil.decrypt(app.getAppPassword(), SystemProperties.getProperty(SystemProperties.Decryption_Key));
-					} catch(Exception e) {
-						logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred in WebServiceCallServiceImpl.get while decrypting the password. Details: " + e.getMessage());
+					try {
+						decryptedPwd = CipherUtil.decrypt(app.getAppPassword(),
+								SystemProperties.getProperty(SystemProperties.Decryption_Key));
+					} catch (Exception e) {
+						logger.error(EELFLoggerDelegate.errorLogger,
+								"FavoritesController.getFavorites failed while decrypting password", e);
 					}
 				} else {
-					logger.warn(EELFLoggerDelegate.errorLogger, "Unable to locate the app information from the database.");
-					appName	= SystemProperties.SDK_NAME;
+					logger.error(EELFLoggerDelegate.errorLogger,
+							"Unable to locate the app information from the database.");
+					appName = SystemProperties.SDK_NAME;
 				}
 				requestId = MDC.get(MDC_KEY_REQUEST_ID);
-				
-				String jsonResponse = FavoritesClient.getFavorites(MDC.get(SystemProperties.MDC_LOGIN_ID), appName, requestId, appUserName, decryptedPwd);
-				
-				logger.debug(EELFLoggerDelegate.debugLogger, "FavoritesMenu response: " + jsonResponse);
-				
+
+				String jsonResponse = FavoritesClient.getFavorites(MDC.get(SystemProperties.MDC_LOGIN_ID), appName,
+						requestId, appUserName, decryptedPwd);
+
+				logger.debug(EELFLoggerDelegate.debugLogger, "FavoritesMenu response: {}", jsonResponse);
 				response.setContentType("application/json");
 				response.getWriter().write(jsonResponse);
 			}
 		} catch (Exception e) {
 			logger.error(EELFLoggerDelegate.errorLogger,
-					"Exception occurred in FavoritesController.getFavorites while performing get_favorites. Details: "
-							+ e.getMessage(), AlarmSeverityEnum.MINOR);
+					"FavoritesController.getFavorites failed", e);
 		}
 	}
 }