1 files changed, 13 insertions, 45 deletions

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 0f8c028bc..5afa0359c 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;
 	}
 }