Fixed config property and test

Author: chillaq

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

@@ -314,7 +314,7 @@ public String proxyPassword() {
         return _proxyPassword;
     }
 
-    public ProxyRuntimeProvider proxyRuntimeStorage() {
+    public ProxyRuntimeProvider proxyRuntimeProvider() {
         return _proxyRuntimeProvider;
     }
 
@@ -816,7 +816,7 @@ public Builder proxyPassword(String proxyPassword) {
          * @param proxyRuntimeProvider
          * @return this builder
          */
-        public Builder proxyRuntimeStorage(ProxyRuntimeProvider proxyRuntimeProvider) {
+        public Builder proxyRuntimeProvider(ProxyRuntimeProvider proxyRuntimeProvider) {
             _proxyRuntimeProvider = proxyRuntimeProvider;
             return this;
         }

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

@@ -634,9 +634,9 @@ private static HttpClientBuilder setupProxy(HttpClientBuilder httpClientbuilder,
             httpClientbuilder.setDefaultCredentialsProvider(credsProvider);
         }
 
-        if (config.proxyRuntimeStorage() != null) {
+        if (config.proxyRuntimeProvider() != null) {
             _log.debug("Proxy setup using token");
-            httpClientbuilder.setDefaultCredentialsProvider(new HttpClientDynamicCredentials(config.proxyRuntimeStorage()));
+            httpClientbuilder.setDefaultCredentialsProvider(new HttpClientDynamicCredentials(config.proxyRuntimeProvider()));
         }
 
         return httpClientbuilder;

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

@@ -283,9 +283,9 @@ public String getJwtToken() {
         config = SplitClientConfig.builder()
                 .proxyHost("proxy-host")
                 .proxyPort(8888)
-                .proxyRuntimeStorage(proxyRuntimeProvider)
+                .proxyRuntimeProvider(proxyRuntimeProvider)
                 .build();
-        Assert.assertEquals(proxyRuntimeProvider, config.proxyRuntimeStorage());
+        Assert.assertEquals(proxyRuntimeProvider, config.proxyRuntimeProvider());
 
         config = SplitClientConfig.builder()
                 .proxyHost("proxy-host")
@@ -319,7 +319,7 @@ public String getJwtToken() {
                 .proxyPort(8888)
                 .proxyUsername("user")
                 .proxyPassword("pass")
-                .proxyRuntimeStorage(proxyRuntimeProvider)
+                .proxyRuntimeProvider(proxyRuntimeProvider)
                 .build();
     }
 
@@ -346,7 +346,7 @@ public String getJwtToken() {
         SplitClientConfig.builder()
                 .proxyHost("proxy-host")
                 .proxyPort(8888)
-                .proxyRuntimeStorage(proxyRuntimeProvider)
+                .proxyRuntimeProvider(proxyRuntimeProvider)
                 .proxyMtlsAuth(new ProxyMTLSAuth.Builder().proxyP12File("path/to/file").proxyP12FilePassKey("pass-key").build())
                 .build();
     }

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

@@ -151,10 +151,10 @@ public void testFactoryInstantiationWithProxyCredentials() throws Exception {
 
         splitFactory.destroy();
     }
-/*
+
     @Test
     public void testFactoryInstantiationWithProxyToken() throws Exception {
-        class MyProxyRuntimeStorage implements ProxyRuntimeStorage {
+        class MyProxyRuntimeProvider implements ProxyRuntimeProvider {
             @Override
             public String getJwtToken() {
                 return "123456789";
@@ -170,7 +170,7 @@ public String getJwtToken() {
                 .authServiceURL(AUTH_SERVICE)
                 .setBlockUntilReadyTimeout(1000)
                 .proxyPort(6060)
-                .proxyRuntimeStorage(new MyProxyRuntimeStorage())
+                .proxyRuntimeProvider(new MyProxyRuntimeProvider())
                 .proxyHost(ENDPOINT)
                 .build();
         SplitFactoryImpl splitFactory2 = new SplitFactoryImpl(API_KEY, splitClientConfig);
@@ -187,17 +187,17 @@ public String getJwtToken() {
 
         Field credentialsProviderField2 = InternalHttp2.getDeclaredField("credentialsProvider");
         credentialsProviderField2.setAccessible(true);
-        BasicCredentialsProvider credentialsProvider2 = (BasicCredentialsProvider) credentialsProviderField2.get(InternalHttp2.cast(httpClientField2.get(client2)));
+        HttpClientDynamicCredentials credentialsProvider2 = (HttpClientDynamicCredentials) credentialsProviderField2.get(InternalHttp2.cast(httpClientField2.get(client2)));
 
-        Field credMapField2 = BasicCredentialsProvider.class.getDeclaredField("credMap");
-        credMapField2.setAccessible(true);
-        ConcurrentHashMap<AuthScope, BearerToken> credMap2 = (ConcurrentHashMap) credMapField2.get(credentialsProvider2);
+        Field proxyRuntimeField = HttpClientDynamicCredentials.class.getDeclaredField("_proxyRuntimeProvider");
+        proxyRuntimeField.setAccessible(true);
+        MyProxyRuntimeProvider proxyRuntime = (MyProxyRuntimeProvider) proxyRuntimeField.get(credentialsProvider2);
 
-        Assert.assertEquals("123456789", credMap2.entrySet().stream().iterator().next().getValue().getToken());
+        assertNotNull("123456789", proxyRuntime.getJwtToken());
 
         splitFactory2.destroy();
     }
-*/
+
     @Test
     public void testFactoryInstantiationWithProxyMtls() throws Exception {
         SplitClientConfig splitClientConfig = SplitClientConfig.builder()