Adjust code for Sonar issues

Made non-functional updates to address static code analysis issues.
Update license header with simple double-quote characters.

Issue: PORTAL-72, PORTAL-90
Change-Id: Ic2c330daea07d721f0e6b350ebf03da97073f7ce
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

3 files changed, 33 insertions, 44 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/FusionLicenseManager.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/FusionLicenseManager.java
index 7f1f2273..1943c390 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/FusionLicenseManager.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/FusionLicenseManager.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
  *
@@ -43,11 +43,8 @@ import java.util.Map;
 
 import javax.servlet.ServletContext;
 
-//import de.schlichtherle.license.LicenseContent;
-
 public interface FusionLicenseManager {
-	
-	
+
 	public static final int DEVELOPER_LICENSE = 0;
 	public static final int EXPIRED_LICENSE = 1;
 	public static final int VALID_LICENSE = 2;
@@ -66,8 +63,6 @@ public interface FusionLicenseManager {
 
 	public int verifyLicense(ServletContext context);
 
-	//public LicenseContent createLicenseContent(Map<String, String> clientInfoMap, List<String> ipAddressList);
-
 	public void generateLicense(Map<String, String> clientInfoMap, List<String> ipAddressList) throws Exception;
 
 	public String nvl(String s);
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/FusionLicenseManagerUtils.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/FusionLicenseManagerUtils.java
index c52abf44..9fb576f5 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/FusionLicenseManagerUtils.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/FusionLicenseManagerUtils.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
  *
@@ -50,42 +50,30 @@ import org.springframework.web.servlet.support.RequestContextUtils;
 
 @Component
 public class FusionLicenseManagerUtils {
-	
+
 	@Autowired
 	private FusionLicenseManager licenseManager;
 
 	@Autowired
 	private SystemProperties sysProps;
-	static {
-	}
-		
+
 	public int verifyLicense(ServletContext context) {
-		if(sysProps == null) {
+		if (sysProps == null) {
 			try {
 				sysProps = new SystemProperties();
 				sysProps.setServletContext(context);
-//				sysProps.load();
-//				licenseManager = new FusionLicenseManagerImpl(new LicenseableClassImpl());
 				System.out.println(licenseManager);
 				licenseManager.installLicense();
-			}
-			catch(Exception ex) {
+			} catch (Exception ex) {
 				ex.printStackTrace();
 			}
 		}
-		
-		
-		
-//		WebApplicationContext ctx =RequestContextUtils.getWebApplicationContext(request);
-//		int flag = ((FusionLicenseManager)ctx.getBean("fusionLicenseManager")).verifyLicense(request);
-//		logger.debug("****************FLAG ******************** " + flag);
-//		return flag;
-//		return 2;
+
 		return licenseManager.verifyLicense(context);
 	}
 
 	public static Date getLicenseExpiryDate(HttpServletRequest request) {
-		WebApplicationContext ctx =RequestContextUtils.getWebApplicationContext(request);
-		return ((FusionLicenseManager)ctx.getBean("fusionLicenseManager")).getExpiredDate();
+		WebApplicationContext ctx = RequestContextUtils.getWebApplicationContext(request);
+		return ((FusionLicenseManager) ctx.getBean("fusionLicenseManager")).getExpiredDate();
 	}
 }
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/LicenseableClass.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/LicenseableClass.java
index cd49f5a5..4d14a359 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/LicenseableClass.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/lm/LicenseableClass.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
  *
@@ -37,20 +37,26 @@
  */
 package org.onap.portalsdk.core.lm;
 
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 
 /**
- * created by Alvin Alexander of http://devdaily.com.
- * modified by Sundar Ramalingam
+ * created by Alvin Alexander of http://devdaily.com. modified by Sundar
+ * Ramalingam
  */
-public interface LicenseableClass
-{
-  public String getApplicationName();
-  public InputStream getPublicKeystoreAsInputStream() throws FileNotFoundException;
-  public String getAlias();
-  public String getPublicKeystorePassword();
-  public String getKeyPasswd();
-  public String getCipherParamPassword();
-  public Class getClassToLicense();
-  
+public interface LicenseableClass {
+	public String getApplicationName();
+
+	public InputStream getPublicKeystoreAsInputStream() throws FileNotFoundException;
+
+	public String getAlias();
+
+	public String getPublicKeystorePassword();
+
+	public String getKeyPasswd();
+
+	public String getCipherParamPassword();
+
+	public Class getClassToLicense();
+
 }