X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Futil%2FHttpsAuthExternalClient.java;h=624a394c73ac8537b4a180d8ab2da8e89aae6710;hb=a86d6a6644d6de3f3f814cd6e25cfe2213d5dd05;hp=888b04f25a197e3cf594a688624fe51598338514;hpb=a395fa69a28a04d0a667fe458b4f10497a1d6794;p=aai%2Faai-common.git

diff --git a/aai-core/src/main/java/org/onap/aai/util/HttpsAuthExternalClient.java b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthExternalClient.java
index 888b04f2..624a394c 100644
--- a/aai-core/src/main/java/org/onap/aai/util/HttpsAuthExternalClient.java
+++ b/aai-core/src/main/java/org/onap/aai/util/HttpsAuthExternalClient.java
@@ -20,7 +20,6 @@
 package org.onap.aai.util;
 
 import java.io.FileInputStream;
-import java.security.KeyManagementException;
 import java.security.KeyStore;
 
 import javax.net.ssl.HostnameVerifier;
@@ -30,9 +29,7 @@ import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 
-import org.onap.aai.domain.yang.Customers;
 import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.json.JSONConfiguration;
@@ -40,41 +37,7 @@ import com.sun.jersey.client.urlconnection.HTTPSProperties;
 
 public class HttpsAuthExternalClient {
 
-	/**
-	 * The main method.
-	 *
-	 * @param args the arguments
-	 */
-	public static void main(String[] args) {
-		try {
-			String url = AAIConfig.get(AAIConstants.AAI_SERVER_URL) + "business/customers";
-			System.out.println("Making Jersey https call...");
-			String keystore = args[0];
-			String keypasswd = args[1];
-			Client client = HttpsAuthExternalClient.getClient(keystore, keypasswd);
-		
-			ClientResponse res = client.resource(url)
-					.accept("application/json")
-					.header("X-TransactionId", "PROV001")
-					.header("X-FromAppId",  "AAI")
-					.type("application/json")
-					.get(ClientResponse.class);
-			
-//			System.out.println("Jersey result: ");
-//			System.out.println(res.getEntity(String.class).toString());
-			
-			Customers customers = res.getEntity(Customers.class);
-			System.out.println("Jersey result: ");
-			System.out.println("Number of customers: " + customers.getCustomer().size());	
-			
-		} catch (KeyManagementException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
-	
 	/**
 	 * Gets the client.
 	 *
@@ -119,12 +82,11 @@ public class HttpsAuthExternalClient {
 			
 			String alg = TrustManagerFactory.getDefaultAlgorithm();
 			TrustManagerFactory tmf = TrustManagerFactory.getInstance(alg);
-			try(FileInputStream tin = new FileInputStream(truststore_path)) {
-				KeyStore ts = KeyStore.getInstance("PKCS12");
-				char[] tpwd = truststore_password.toCharArray();
-				ts.load(tin, tpwd);
-				tmf.init(ts);
-			}
+			FileInputStream tin = new FileInputStream(truststore_path);
+			KeyStore ts = KeyStore.getInstance("PKCS12");
+			char[] tpwd = truststore_password.toCharArray();
+			ts.load(tin, tpwd);
+			tmf.init(ts);
 	
 			//ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
 			// Updating key manager to null, to disable two way SSL