Merge "removed code smells in some components"

7 files changed, 2 insertions, 23 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
index 9c8a8838..9ed0f38c 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserApiServiceImpl.java
@@ -7,7 +7,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
  *
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/ServiceLocatorImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/ServiceLocatorImpl.java
index e348882d..3ed6188b 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/ServiceLocatorImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/support/ServiceLocatorImpl.java
@@ -66,14 +66,6 @@ public class ServiceLocatorImpl implements ServiceLocator {
 	public ServiceLocatorImpl() {
 	}
 
-	/*
-	 * public static ServiceLocator getLocator() { if (locator == null) locator =
-	 * new ServiceLocator(); return locator; }
-	 * 
-	 * public Object clone() throws CloneNotSupportedException { throw new
-	 * CloneNotSupportedException(); }
-	 */
-
 	// Get an LDAP directory context
 	public DirContext getDirContext(String initialContextFactory, String providerUrl, String securityPrincipal) {
 
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java
index f31fc651..95388650 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java
@@ -151,7 +151,6 @@ public class UserUtils {
 	}
 
 	public static Map getRoles(HttpServletRequest request) {
-		// HttpSession session = request.getSession();
 		HttpSession session = AppUtils.getSession(request);
 		Map roles = (Map) session.getAttribute(SystemProperties.getProperty(SystemProperties.ROLES_ATTRIBUTE_NAME));
 
diff --git a/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/Container.java b/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/Container.java
index 1c122491..65026a9c 100644
--- a/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/Container.java
+++ b/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/Container.java
@@ -294,7 +294,6 @@ public class Container {
 							ysum += elementRowCol.get(String.valueOf(k) + String.valueOf(j)).computeSize().getHeight();
 					}
 					p.y = i * interEleH + ysum + this.getP().getY() + interEleToContainerH;
-					// containerCoord.add(c,p);
 					xsum += c.computeSize().getWidth();
 					c.setP(p);
 
diff --git a/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/DomainVo.java b/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/DomainVo.java
index d2f41c90..223bb141 100644
--- a/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/DomainVo.java
+++ b/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/DomainVo.java
@@ -52,7 +52,6 @@ import org.onap.portalsdk.core.domain.FusionVo;
 public class DomainVo extends FusionVo implements Serializable, Cloneable, Comparable {
 
 //	TODO: Remove after the EELFLoggerImpl
-//	private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(DomainVo.class);
 
 	private static final long serialVersionUID = 1L;
 	protected Long id;
@@ -159,7 +158,7 @@ public class DomainVo extends FusionVo implements Serializable, Cloneable, Compa
 
 		} catch (Exception e) {
 			
-//	TODO: Remove after the EELFLoggerImpl		logger.error(EELFLoggerDelegate.errorLogger, "copy failed", e);
+//	TODO: Remove after the EELFLoggerImpl	
 			e.printStackTrace();
 		}
 
diff --git a/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java b/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java
index 33a347de..7b1a5c42 100644
--- a/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java
+++ b/ecomp-sdk/epsdk-domain/src/main/java/org/onap/portalsdk/core/domain/support/Layout.java
@@ -627,7 +627,6 @@ public class Layout {
 			double newX = 0.0;
 			if (i + 1 < domainstoUpd.size())
 				newX = domainstoUpd.get(i + 1).getP().getX();
-			// d.setDomainToLayoutWd(domainstoUpd.get(i+1).getP().getX());
 			else
 				newX = domainstoUpd.get(i).getP().getX() + 38;
 
diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java
index 90addfe5..52864319 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java
@@ -263,13 +263,4 @@ public class CipherUtil {
 		return CipherUtil.decryptPKC(encryptedText, keyString);
 	}
 
-	/*public static void main(String[] args) throws CipherUtilException {
-
-		String testValue = "Welcome123";
-		String encrypted;
-		String decrypted;
-
-
-	}
-*/
 }