Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

3 files changed, 20 insertions, 278 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/client/FakeHttpSession.java b/vid-app-common/src/main/java/org/onap/vid/client/FakeHttpSession.java
deleted file mode 100644
index 69ce11f4..00000000
--- a/vid-app-common/src/main/java/org/onap/vid/client/FakeHttpSession.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.onap.vid.client;
-
-import org.apache.commons.io.IOUtils;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by pickjonathan on 03/07/2017.
- */
-public class FakeHttpSession implements HttpSession {
-
-    /**
-     * Setup the creation time
-     */
-    public FakeHttpSession() {
-        File file = new File("resources/roles.json");
-
-        String rolesInputStream = null;
-        try {
-            rolesInputStream = IOUtils.toString(FakeHttpSession.class.getClassLoader().getResourceAsStream("roles.json"),"UTF8");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        JSONTokener tokener = new JSONTokener(rolesInputStream);
-        JSONObject roles = new JSONObject(tokener);
-
-        JSONArray rolesArray = roles.getJSONArray("roles");
-
-        //set permissions to the roles from file.
-        this.setAttribute("role", rolesArray);
-
-        creationTime = System.currentTimeMillis();
-    }
-
-
-    /**
-     * Setup the creation time
-     * @param id The new session id
-     */
-    public FakeHttpSession(String id)
-    {
-        this.id = id;
-        creationTime = System.currentTimeMillis();
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getCreationTime()
-     */
-    public long getCreationTime()
-    {
-        return creationTime;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getId()
-     */
-    public String getId()
-    {
-        if (id == null)
-        {
-            System.out.println("Inventing data in FakeHttpSession.getId() to remain plausible.");
-            id = "fake";
-        }
-
-        return id;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getLastAccessedTime()
-     */
-    public long getLastAccessedTime()
-    {
-        return creationTime;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getServletContext()
-     */
-    public ServletContext getServletContext()
-    {
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#setMaxInactiveInterval(int)
-     */
-    public void setMaxInactiveInterval(int maxInactiveInterval)
-    {
-        this.maxInactiveInterval = maxInactiveInterval;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getMaxInactiveInterval()
-     */
-    public int getMaxInactiveInterval()
-    {
-        return maxInactiveInterval;
-    }
-
-    /**
-     * @see javax.servlet.http.HttpSession#getSessionContext()
-     * @deprecated
-     */
-    @SuppressWarnings({"UnnecessaryFullyQualifiedName"})
-    @Deprecated
-    public javax.servlet.http.HttpSessionContext getSessionContext()
-    {
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getAttribute(java.lang.String)
-     */
-    public Object getAttribute(String name)
-    {
-        return attributes.get(name);
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getValue(java.lang.String)
-     */
-    @Deprecated
-    public Object getValue(String name)
-    {
-        return attributes.get(name);
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getAttributeNames()
-     */
-    public Enumeration<String> getAttributeNames()
-    {
-        return Collections.enumeration(attributes.keySet());
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#getValueNames()
-     */
-    @Deprecated
-    public String[] getValueNames()
-    {
-        return attributes.keySet().toArray(new String[attributes.keySet().size()]);
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#setAttribute(java.lang.String, java.lang.Object)
-     */
-    public void setAttribute(String name, Object value)
-    {
-        attributes.put(name, value);
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#putValue(java.lang.String, java.lang.Object)
-     */
-    @Deprecated
-    public void putValue(String name, Object value)
-    {
-        attributes.put(name, value);
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#removeAttribute(java.lang.String)
-     */
-    public void removeAttribute(String name)
-    {
-        attributes.remove(name);
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#removeValue(java.lang.String)
-     */
-    @Deprecated
-    public void removeValue(String name)
-    {
-        attributes.remove(name);
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#invalidate()
-     */
-    public void invalidate()
-    {
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpSession#isNew()
-     */
-    public boolean isNew()
-    {
-        return true;
-    }
-
-    /**
-     * The session id
-     */
-    private String id = null;
-
-    /**
-     * The list of attributes
-     */
-    private Map<String, Object> attributes = new HashMap<String, Object>();
-
-    /**
-     * When were we created
-     */
-    private long creationTime;
-
-    /**
-     * How long before we timeout?
-     */
-    private int maxInactiveInterval = 30 * 60 * 1000;
-}
diff --git a/vid-app-common/src/main/java/org/onap/vid/client/HttpBasicClient.java b/vid-app-common/src/main/java/org/onap/vid/client/HttpBasicClient.java
index ac057a87..8f0d59fd 100644
--- a/vid-app-common/src/main/java/org/onap/vid/client/HttpBasicClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/client/HttpBasicClient.java
@@ -21,18 +21,16 @@
 package org.onap.vid.client;
 
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-
-import javax.servlet.ServletContext;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import javax.servlet.ServletContext;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 
 /**
  *  General HTTP client.
@@ -56,7 +54,7 @@ public class HttpBasicClient{
 	 * @return Client client object
 	 * @throws Exception the exception
 	 */
-	public static Client getClient() throws Exception {
+	public static Client getClient() {
 		
 		ClientConfig config = new ClientConfig();
 		config.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
diff --git a/vid-app-common/src/main/java/org/onap/vid/client/HttpsBasicClient.java b/vid-app-common/src/main/java/org/onap/vid/client/HttpsBasicClient.java
index 0f8c028b..5afa0359 100644
--- a/vid-app-common/src/main/java/org/onap/vid/client/HttpsBasicClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/client/HttpsBasicClient.java
@@ -20,10 +20,12 @@
 
 package org.onap.vid.client;
 
-import java.io.File;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import org.eclipse.jetty.util.security.Password;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+import org.onap.vid.properties.VidProperties;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.util.SystemProperties;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -31,13 +33,10 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
-
-import org.eclipse.jetty.util.security.Password;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.util.SystemProperties;
-import org.onap.vid.properties.VidProperties;
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
  /**
   *  General SSL client using the VID tomcat keystore. It doesn't use client certificates.
@@ -57,12 +56,10 @@ public class HttpsBasicClient{
 	 * @return Client The SSL client
 	 * @throws Exception the exception
 	 */
-	public static Client getClient() throws Exception {
+	public static Client getClient() {
 		String methodName = "getClient";
 		ClientConfig config = new ClientConfig();
-		//config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
-		//config.getClasses().add(org.onap.aai.util.CustomJacksonJaxBJsonProvider.class);
-	
+
 		SSLContext ctx = null;
 		
 		try {
@@ -80,10 +77,6 @@ public class HttpsBasicClient{
 			File tr = new File (truststore_path);
 			logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + " " + methodName + " absolute truststore path=" + tr.getAbsolutePath());
 			
-			//String keystore_path = certFilePath + AAIProperties.FILESEPARTOR + SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_FILENAME);
-			//String keystore_password = SystemProperties.getProperty(AAIProperties.AAI_KEYSTORE_PASSWD_X);
-			//String decrypted_keystore_password = EncryptedPropValue.decryptTriple(keystore_password);
-			
 		    System.setProperty("javax.net.ssl.trustStore", truststore_path);
 		    System.setProperty("javax.net.ssl.trustStorePassword", decrypted_truststore_password);
 			HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
@@ -94,24 +87,7 @@ public class HttpsBasicClient{
 	
 			//May need to make the algorithm a parameter. MSO requires TLSv1.1	or TLSv1.2
 			ctx = SSLContext.getInstance("TLSv1.2");
-			
-			/*
-			KeyManagerFactory kmf = null;
-			try {
-				kmf = KeyManagerFactory.getInstance("SunX509");
-				FileInputStream fin = new FileInputStream(keystore_path);
-				KeyStore ks = KeyStore.getInstance("PKCS12");
-				char[] pwd = decrypted_keystore_password.toCharArray();
-				ks.load(fin, pwd);
-				kmf.init(ks, pwd);
-			} catch (Exception e) {
-				System.out.println("Error setting up kmf: exiting");
-				e.printStackTrace();
-				System.exit(1);
-			}
 
-			ctx.init(kmf.getKeyManagers(), null, null);
-			*/
 			ctx.init(null, null, null);
 			//config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES,
 			//							new HTTPSProperties( , ctx));
@@ -128,16 +104,8 @@ public class HttpsBasicClient{
 				.register(org.onap.vid.aai.util.CustomJacksonJaxBJsonProvider.class);
 			
 		} catch (Exception e) {
-			logger.debug(EELFLoggerDelegate.debugLogger, "Error setting up config: exiting");
-			//System.out.println("Error setting up config: exiting");
-			e.printStackTrace();
+			logger.debug(EELFLoggerDelegate.debugLogger, "Error setting up config: exiting", e);
 			return null;
 		}
-			
-		//Client client = ClientBuilder.newClient(config);
-		// uncomment this line to get more logging for the request/response
-		// client.addFilter(new LoggingFilter(System.out));
-		
-		//return client;
 	}
 }