Changed p12file type to InputStream

Author: chillaq

client/src/main/java/io/split/client/SplitFactoryImpl.java

@@ -116,6 +116,8 @@
 import pluggable.CustomStorageWrapper;
 
 import javax.net.ssl.SSLContext;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
@@ -606,7 +608,7 @@ private static SSLContext buildSSLContext(SplitClientConfig config) throws IOExc
             InputStream keystoreStream = null;
             try {
                 KeyStore keyStore = KeyStore.getInstance("PKCS12");
-                keystoreStream = java.nio.file.Files.newInputStream(Paths.get(config.proxyConfiguration().getP12File()));
+                keystoreStream = config.proxyConfiguration().getP12File();
                 keyStore.load(keystoreStream, config.proxyConfiguration().getPassKey().toCharArray());
                 sslContext = SSLContexts.custom()
                         .loadKeyMaterial(keyStore, config.proxyConfiguration().getPassKey().toCharArray())

client/src/main/java/io/split/client/dtos/ProxyConfiguration.java

@@ -2,26 +2,27 @@
 
 import org.apache.hc.core5.http.HttpHost;
 
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 
 public class ProxyConfiguration {
     private final HttpHost _proxyHost;
     private ProxyCredentialsProvider _provider;
-    private final String _p12File;
+    private final InputStream _p12File;
     private final String _passKey;
 
     private ProxyConfiguration(HttpHost proxyHost,
                                ProxyCredentialsProvider proxyCredentialsProvider,
-                               String p12File, String passKey) {
+                               InputStream p12File, String passKey) {
         _proxyHost = proxyHost;
         _p12File = p12File;
         _passKey = passKey;
         _provider = proxyCredentialsProvider;
     }
 
     public HttpHost getHost() { return _proxyHost; }
-    public String getP12File() { return _p12File; }
+    public InputStream getP12File() { return _p12File; }
     public String getPassKey() { return _passKey; }
     public ProxyCredentialsProvider getProxyCredentialsProvider() { return _provider; }
 
@@ -32,7 +33,7 @@ public static ProxyConfiguration.Builder builder() {
     public static class Builder {
         private ProxyCredentialsProvider _provider;
         private HttpHost _proxyHost;
-        private String _p12File;
+        private InputStream _p12File;
         private String _passKey;
 
         public ProxyConfiguration.Builder credentialsProvider(ProxyCredentialsProvider provider) {
@@ -49,7 +50,7 @@ public ProxyConfiguration.Builder url(URL url) throws MalformedURLException {
             return this;
         }
 
-        public ProxyConfiguration.Builder mtls(String p12File, String passKey) {
+        public ProxyConfiguration.Builder mtls(InputStream p12File, String passKey) {
             _passKey = passKey;
             _p12File = p12File;
             return this;

client/src/test/java/io/split/client/SplitClientConfigTest.java

@@ -13,6 +13,8 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -260,7 +262,7 @@ public Map<String, List<String>> getHeaderOverrides(RequestContext context) {
     }
 
     @Test
-    public void checkProxyParams() throws MalformedURLException {
+    public void checkProxyParams() throws MalformedURLException, FileNotFoundException {
         SplitClientConfig config = SplitClientConfig.builder()
                 .proxyConfiguration(new ProxyConfiguration.Builder()
                         .url(new URL("https://proxy-host:8888"))
@@ -304,14 +306,14 @@ public String getToken() {
                         .build())
                 .build();
         Assert.assertEquals(bearerCredentialsProvider, config.proxyConfiguration().getProxyCredentialsProvider());
-
+        FileInputStream p12File = new FileInputStream("src/test/resources/keyStore.p12");
         config = SplitClientConfig.builder()
                 .proxyConfiguration(new ProxyConfiguration.Builder()
                         .url(new URL("https://proxy-host:888"))
-                        .mtls("path/to/file", "pass-key")
+                        .mtls(p12File, "pass-key")
                         .build())
                 .build();
-        Assert.assertEquals("path/to/file", config.proxyConfiguration().getP12File());
+        Assert.assertEquals(p12File, config.proxyConfiguration().getP12File());
         Assert.assertEquals("pass-key", config.proxyConfiguration().getPassKey());
     }
 
@@ -352,11 +354,11 @@ public void mustUseP12FileWithProxyMtls() throws MalformedURLException {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void mustUseP12PassKeyWithProxyMtls() throws MalformedURLException {
+    public void mustUseP12PassKeyWithProxyMtls() throws MalformedURLException, FileNotFoundException {
         SplitClientConfig.builder()
                 .proxyConfiguration(new ProxyConfiguration.Builder()
                         .url(new URL("https://proxy-host:888"))
-                        .mtls("path/to/file", null)
+                        .mtls(new FileInputStream("src/test/resources/keyStore.p12"), null)
                         .build())
                 .build();
     }

client/src/test/java/io/split/client/SplitFactoryImplTest.java

@@ -242,7 +242,7 @@ public void testFactoryInstantiationWithProxyMtls() throws Exception {
                 .setBlockUntilReadyTimeout(1000)
                 .proxyConfiguration(ProxyConfiguration.builder()
                         .url(new URL("http://proxy-name:6060"))
-                        .mtls("src/test/resources/keyStore.p12", "split")
+                        .mtls(new FileInputStream("src/test/resources/keyStore.p12"), "split")
                         .build())
                 .build();
         SplitFactoryImpl splitFactory3 = new SplitFactoryImpl(API_KEY, splitClientConfig);