renamed interface

Author: chillaq

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

@@ -7,18 +7,18 @@
 
 class HttpClientDynamicCredentials implements  org.apache.hc.client5.http.auth.CredentialsProvider {
 
-    private final ProxyRuntimeStorage _proxyRuntimeStorage;
+    private final ProxyRuntimeProvider _proxyRuntimeProvider;
 
-    public HttpClientDynamicCredentials (ProxyRuntimeStorage proxyRuntimeStorage) {
-        _proxyRuntimeStorage = proxyRuntimeStorage;
+    public HttpClientDynamicCredentials (ProxyRuntimeProvider proxyRuntimeProvider) {
+        _proxyRuntimeProvider = proxyRuntimeProvider;
     }
 
     @Override
     public Credentials getCredentials(AuthScope authScope, HttpContext context) {
 
         // This Provider is invoked every time a request is made.
         // This should invoke a user-custom provider responsible for:
-        return new BearerToken(_proxyRuntimeStorage.getJwtToken());
+        return new BearerToken(_proxyRuntimeProvider.getJwtToken());
     }
 
 }

…io/split/client/ProxyRuntimeStorage.java …o/split/client/ProxyRuntimeProvider.javaclient/src/main/java/io/split/client/ProxyRuntimeStorage.java renamed to client/src/main/java/io/split/client/ProxyRuntimeProvider.java client/src/main/java/io/split/client/ProxyRuntimeStorage.java renamed to client/src/main/java/io/split/client/ProxyRuntimeProvider.java

@@ -1,6 +1,6 @@
 package io.split.client;
 
-public interface ProxyRuntimeStorage
+public interface ProxyRuntimeProvider
 {
     /**
      * Get the additional headers needed for all http operations

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

@@ -91,7 +91,7 @@ public static class HttpScheme {
     private final HttpHost _proxy;
     private final String _proxyUsername;
     private final String _proxyPassword;
-    private final ProxyRuntimeStorage _proxyRuntimeStorage;
+    private final ProxyRuntimeProvider _proxyRuntimeProvider;
     private final ProxyMTLSAuth _proxyMtlsAuth;
 
     // To be set during startup
@@ -126,7 +126,7 @@ private SplitClientConfig(String endpoint,
                               HttpHost proxy,
                               String proxyUsername,
                               String proxyPassword,
-                              ProxyRuntimeStorage proxyRuntimeStorage,
+                              ProxyRuntimeProvider proxyRuntimeProvider,
                               ProxyMTLSAuth proxyMtlsAuth,
                               int eventsQueueSize,
                               long eventSendIntervalInMillis,
@@ -181,7 +181,7 @@ private SplitClientConfig(String endpoint,
         _proxy = proxy;
         _proxyUsername = proxyUsername;
         _proxyPassword = proxyPassword;
-        _proxyRuntimeStorage = proxyRuntimeStorage;
+        _proxyRuntimeProvider = proxyRuntimeProvider;
         _proxyMtlsAuth = proxyMtlsAuth;
         _eventsQueueSize = eventsQueueSize;
         _eventSendIntervalInMillis = eventSendIntervalInMillis;
@@ -314,8 +314,8 @@ public String proxyPassword() {
         return _proxyPassword;
     }
 
-    public ProxyRuntimeStorage proxyRuntimeStorage() {
-        return _proxyRuntimeStorage;
+    public ProxyRuntimeProvider proxyRuntimeStorage() {
+        return _proxyRuntimeProvider;
     }
 
     public ProxyMTLSAuth proxyMTLSAuth() {
@@ -463,7 +463,7 @@ public static final class Builder {
         private String _proxyScheme = HttpScheme.HTTP;
         private String _proxyUsername;
         private String _proxyPassword;
-        private ProxyRuntimeStorage _proxyRuntimeStorage;
+        private ProxyRuntimeProvider _proxyRuntimeProvider;
         private ProxyMTLSAuth _proxyMtlsAuth;
         private int _eventsQueueSize = 500;
         private long _eventSendIntervalInMillis = 30 * (long)1000;
@@ -813,11 +813,11 @@ public Builder proxyPassword(String proxyPassword) {
         /**
          * Set the token for authentication against the proxy (if proxy settings are enabled). (Optional).
          *
-         * @param proxyRuntimeStorage
+         * @param proxyRuntimeProvider
          * @return this builder
          */
-        public Builder proxyRuntimeStorage(ProxyRuntimeStorage proxyRuntimeStorage) {
-            _proxyRuntimeStorage = proxyRuntimeStorage;
+        public Builder proxyRuntimeStorage(ProxyRuntimeProvider proxyRuntimeProvider) {
+            _proxyRuntimeProvider = proxyRuntimeProvider;
             return this;
         }
 
@@ -1161,19 +1161,19 @@ private void verifyProxy() {
                 throw new IllegalArgumentException("Proxy scheme must be either http or https.");
             }
 
-            if (_proxyUsername == null && _proxyRuntimeStorage == null && _proxyMtlsAuth == null) {
+            if (_proxyUsername == null && _proxyRuntimeProvider == null && _proxyMtlsAuth == null) {
                 return;
             }
 
-            if (_proxyUsername != null && _proxyRuntimeStorage != null) {
+            if (_proxyUsername != null && _proxyRuntimeProvider != null) {
                 throw new IllegalArgumentException("Proxy user and Proxy token params are updated, set only one param.");
             }
 
             if (_proxyUsername != null && _proxyMtlsAuth != null) {
                 throw new IllegalArgumentException("Proxy user and Proxy mTLS params are updated, set only one param.");
             }
 
-            if (_proxyRuntimeStorage != null && _proxyMtlsAuth != null) {
+            if (_proxyRuntimeProvider != null && _proxyMtlsAuth != null) {
                 throw new IllegalArgumentException("Proxy token and Proxy mTLS params are updated, set only one param.");
             }
 
@@ -1223,7 +1223,7 @@ public SplitClientConfig build() {
                     proxy(),
                     _proxyUsername,
                     _proxyPassword,
-                    _proxyRuntimeStorage,
+                        _proxyRuntimeProvider,
                     _proxyMtlsAuth,
                     _eventsQueueSize,
                     _eventSendIntervalInMillis,

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

@@ -273,7 +273,7 @@ public void checkProxyParams() {
         Assert.assertEquals("user", config.proxyUsername());
         Assert.assertEquals("pass", config.proxyPassword());
 
-        ProxyRuntimeStorage proxyRuntimeStorage = new ProxyRuntimeStorage() {
+        ProxyRuntimeProvider proxyRuntimeProvider = new ProxyRuntimeProvider() {
             @Override
             public String getJwtToken() {
                 return "my-token";
@@ -283,9 +283,9 @@ public String getJwtToken() {
         config = SplitClientConfig.builder()
                 .proxyHost("proxy-host")
                 .proxyPort(8888)
-                .proxyRuntimeStorage(proxyRuntimeStorage)
+                .proxyRuntimeStorage(proxyRuntimeProvider)
                 .build();
-        Assert.assertEquals(proxyRuntimeStorage, config.proxyRuntimeStorage());
+        Assert.assertEquals(proxyRuntimeProvider, config.proxyRuntimeStorage());
 
         config = SplitClientConfig.builder()
                 .proxyHost("proxy-host")
@@ -307,7 +307,7 @@ public void cannotUseInvalidHttpScheme() {
 
     @Test(expected = IllegalArgumentException.class)
     public void cannotUseProxyTokenAndProxyUsername() {
-        ProxyRuntimeStorage proxyRuntimeStorage = new ProxyRuntimeStorage() {
+        ProxyRuntimeProvider proxyRuntimeProvider = new ProxyRuntimeProvider() {
             @Override
             public String getJwtToken() {
                 return "my-token";
@@ -319,7 +319,7 @@ public String getJwtToken() {
                 .proxyPort(8888)
                 .proxyUsername("user")
                 .proxyPassword("pass")
-                .proxyRuntimeStorage(proxyRuntimeStorage)
+                .proxyRuntimeStorage(proxyRuntimeProvider)
                 .build();
     }
 
@@ -336,7 +336,7 @@ public void cannotUseProxyUserAndProxyMtls() {
 
     @Test(expected = IllegalArgumentException.class)
     public void cannotUseProxyTokenAndProxyMtls() {
-        ProxyRuntimeStorage proxyRuntimeStorage = new ProxyRuntimeStorage() {
+        ProxyRuntimeProvider proxyRuntimeProvider = new ProxyRuntimeProvider() {
             @Override
             public String getJwtToken() {
                 return "my-token";
@@ -346,7 +346,7 @@ public String getJwtToken() {
         SplitClientConfig.builder()
                 .proxyHost("proxy-host")
                 .proxyPort(8888)
-                .proxyRuntimeStorage(proxyRuntimeStorage)
+                .proxyRuntimeStorage(proxyRuntimeProvider)
                 .proxyMtlsAuth(new ProxyMTLSAuth.Builder().proxyP12File("path/to/file").proxyP12FilePassKey("pass-key").build())
                 .build();
     }