Merge "lowered some code smells in a few components"

3 files changed, 2 insertions, 11 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java
index d04acc8d..83962c63 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SingleSignOnController.java
@@ -218,7 +218,7 @@ public class SingleSignOnController extends UnRestrictedBaseController {
 			final String redirectUrl = portalUrl + "?uebAppKey=" + uebAppKey + "&redirectUrl=" + encodedReturnToAppUrl;
 			logger.debug(EELFLoggerDelegate.debugLogger, "singleSignOnLogin: portal-bound redirect URL is {}",
 					redirectUrl);
-			// this line may not be necessary but jsessionid coockie is not getting created in all cases;
+			// this line may not be necessary but jsessionid coockie is not getting created in all cases
 			// so force the cookie creation
 			request.getSession(true);
 			
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/scheduler/LogJob.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/scheduler/LogJob.java
index f71d41c5..40306a4d 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/scheduler/LogJob.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/scheduler/LogJob.java
@@ -53,9 +53,6 @@ public class LogJob extends QuartzJobBean {
 	@Override
 	protected void executeInternal(JobExecutionContext ctx)
 			throws JobExecutionException {
-	   // JobDataMap dataMap = ctx.getJobDetail().getJobDataMap();
- 	   //int cnt = dataMap.getInt("");
-	   // JobKey jobKey = ctx.getJobDetail().getKey();
 	   logger.info(EELFLoggerDelegate.debugLogger, (Runtime.getRuntime().maxMemory() + " " + Runtime.getRuntime().maxMemory()));
 
 	}
diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java
index ae131a05..2b75aea1 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/service/OnBoardingApiServiceImpl.java
@@ -306,7 +306,7 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR
 				// response yet ..
 				// commenting throw clauses until portal is ready
 				// throw new PortalAPIException("User + " + loginId + " doesn't
-				// exist");
+				// exist")
 			} else
 				return UserUtils.convertToEcompUser(user);
 		} catch (Exception e) {
@@ -315,7 +315,6 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR
 			return null;
 			// Unfortunately, Portal is not ready to accept proper error response
 			// yet .. commenting throw clauses until portal is ready
-			// throw new PortalAPIException(response, e);
 		}
 
 	}
@@ -388,11 +387,6 @@ public class OnBoardingApiServiceImpl implements IPortalRestAPIService, IPortalR
 				logger.debug(EELFLoggerDelegate.debugLogger, "## REST API ## loginId: {}, roles Json {}", loginId,
 						rolesJson);
 			User user = userProfileService.getUserByLoginId(loginId);
-			/*
-			 * List<EcompRole> ecompRoles = mapper.readValue(rolesJson,
-			 * TypeFactory.defaultInstance().constructCollectionType(List.class,
-			 * EcompRole.class));
-			 */
 			SortedSet<Role> roles = new TreeSet<>();
 			for (EcompRole role : rolesJson) {
 				roles.add(roleService.getRole(loginId,role.getId()));