Changed Kerberos client to use okhttp lib

CHANGES.txt

@@ -1,3 +1,6 @@
+4.13.0 (Sep 13, 2024)
+- Added support for Kerberos Proxy authentication.
+
 4.12.1 (Jun 10, 2024)
 - Fixed deadlock for virtual thread in Push Manager and SSE Client.
 

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.13.0-rc1</version>
+        <version>4.13.0</version>
     </parent>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>
@@ -64,6 +64,7 @@
                                     <include>io.split.schemas:*</include>
                                     <include>io.codigo.grammar:*</include>
                                     <include>org.apache.httpcomponents.*</include>
+                                    <include>org.apache.hc.*</include>
                                     <include>com.google.*</include>
                                     <include>org.yaml:snakeyaml:*</include>
 
@@ -238,5 +239,17 @@
             <version>4.0.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.7.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+            <version>1.7.4</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

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

@@ -2,16 +2,12 @@
 
 import io.split.client.dtos.RequestContext;
 
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.Header;
 
 import java.util.HashSet;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Arrays;
-import java.util.ArrayList;
 import java.util.Set;
-import java.util.List;
+import java.util.stream.Collectors;
 
 public final class RequestDecorator {
     CustomHeaderDecorator _headerDecorator;
@@ -36,42 +32,16 @@ public RequestDecorator(CustomHeaderDecorator headerDecorator) {
                 : headerDecorator;
     }
 
-    public HttpRequest decorateHeaders(HttpRequest request) {
+    public RequestContext decorateHeaders(RequestContext request) {
         try {
-            Map<String, List<String>> headers = _headerDecorator
-                    .getHeaderOverrides(new RequestContext(convertToMap(request.getHeaders())));
-            for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-                if (isHeaderAllowed(entry.getKey())) {
-                    List<String> values = entry.getValue();
-                    for (int i = 0; i < values.size(); i++) {
-                        if (i == 0) {
-                            request.setHeader(entry.getKey(), values.get(i));
-                        } else {
-                            request.addHeader(entry.getKey(), values.get(i));
-                        }
-                    }
-                }
-            }
+            return new RequestContext(_headerDecorator.getHeaderOverrides(request)
+                    .entrySet()
+                    .stream()
+                    .filter(e -> !forbiddenHeaders.contains(e.getKey().toLowerCase()))
+                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
         } catch (Exception e) {
             throw new IllegalArgumentException(
                     String.format("Problem adding custom headers to request decorator: %s", e), e);
         }
-
-        return request;
-    }
-
-    private boolean isHeaderAllowed(String headerName) {
-        return !forbiddenHeaders.contains(headerName.toLowerCase());
-    }
-
-    private Map<String, List<String>> convertToMap(Header[] to_convert) {
-        Map<String, List<String>> to_return = new HashMap<String, List<String>>();
-        for (Integer i = 0; i < to_convert.length; i++) {
-            if (!to_return.containsKey(to_convert[i].getName())) {
-                to_return.put(to_convert[i].getName(), new ArrayList<String>());
-            }
-            to_return.get(to_convert[i].getName()).add(to_convert[i].getValue());
-        }
-        return to_return;
     }
 }

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

@@ -4,9 +4,9 @@
 import io.split.client.impressions.ImpressionsManager;
 import io.split.client.utils.FileTypeEnum;
 import io.split.integrations.IntegrationsConfig;
+import io.split.service.CustomHttpModule;
 import io.split.storages.enums.OperationMode;
 import io.split.storages.enums.StorageMode;
-import io.split.service.HttpAuthScheme;
 import org.apache.hc.core5.http.HttpHost;
 import pluggable.CustomStorageWrapper;
 
@@ -92,8 +92,7 @@ public class SplitClientConfig {
     private final HashSet<String> _flagSetsFilter;
     private final int _invalidSets;
     private final CustomHeaderDecorator _customHeaderDecorator;
-    private final HttpAuthScheme _authScheme;
-
+    private final CustomHttpModule _alternativeHTTPModule;
 
     public static Builder builder() {
         return new Builder();
@@ -151,7 +150,7 @@ private SplitClientConfig(String endpoint,
                               HashSet<String> flagSetsFilter,
                               int invalidSets,
                               CustomHeaderDecorator customHeaderDecorator,
-                              HttpAuthScheme authScheme) {
+                              CustomHttpModule alternativeHTTPModule) {
         _endpoint = endpoint;
         _eventsEndpoint = eventsEndpoint;
         _featuresRefreshRate = pollForFeatureChangesEveryNSeconds;
@@ -204,7 +203,7 @@ private SplitClientConfig(String endpoint,
         _flagSetsFilter = flagSetsFilter;
         _invalidSets = invalidSets;
         _customHeaderDecorator = customHeaderDecorator;
-        _authScheme = authScheme;
+        _alternativeHTTPModule = alternativeHTTPModule;
 
         Properties props = new Properties();
         try {
@@ -412,10 +411,8 @@ public int getInvalidSets() {
     public CustomHeaderDecorator customHeaderDecorator() {
         return _customHeaderDecorator;
     }
-    public HttpAuthScheme authScheme() {
-        return _authScheme;
-    }
 
+    public CustomHttpModule alternativeHTTPModule() { return _alternativeHTTPModule; }
     public static final class Builder {
 
         private String _endpoint = SDK_ENDPOINT;
@@ -473,7 +470,7 @@ public static final class Builder {
         private HashSet<String> _flagSetsFilter = new HashSet<>();
         private int _invalidSetsCount = 0;
         private CustomHeaderDecorator _customHeaderDecorator = null;
-        private HttpAuthScheme _authScheme = null;
+        private CustomHttpModule _alternativeHTTPModule = null;
 
         public Builder() {
         }
@@ -969,13 +966,13 @@ public Builder customHeaderDecorator(CustomHeaderDecorator customHeaderDecorator
         }
 
         /**
-         * Authentication Scheme
+         * Alternative Http Client
          *
-         * @param authScheme
+         * @param alternativeHTTPModule
          * @return this builder
          */
-        public Builder authScheme(HttpAuthScheme authScheme) {
-            _authScheme = authScheme;
+        public Builder alternativeHTTPModule(CustomHttpModule alternativeHTTPModule) {
+            _alternativeHTTPModule = alternativeHTTPModule;
             return this;
         }
 
@@ -990,7 +987,7 @@ public Builder threadFactory(ThreadFactory threadFactory) {
             return this;
         }
 
-        public SplitClientConfig build() {
+        private void verifyRates() {
             if (_featuresRefreshRate < 5 ) {
                 throw new IllegalArgumentException("featuresRefreshRate must be >= 5: " + _featuresRefreshRate);
             }
@@ -999,35 +996,19 @@ public SplitClientConfig build() {
                 throw new IllegalArgumentException("segmentsRefreshRate must be >= 30: " + _segmentsRefreshRate);
             }
 
-            switch (_impressionsMode) {
-                case OPTIMIZED:
-                    _impressionsRefreshRate = (_impressionsRefreshRate <= 0) ? 300 : Math.max(60, _impressionsRefreshRate);
-                    break;
-                case DEBUG:
-                    _impressionsRefreshRate = (_impressionsRefreshRate <= 0) ? 60 : _impressionsRefreshRate;
-                    break;
-            }
-
             if (_eventSendIntervalInMillis < 1000) {
                 throw new IllegalArgumentException("_eventSendIntervalInMillis must be >= 1000: " + _eventSendIntervalInMillis);
             }
 
             if (_metricsRefreshRate < 30) {
                 throw new IllegalArgumentException("metricsRefreshRate must be >= 30: " + _metricsRefreshRate);
             }
-
-            if (_impressionsQueueSize <=0 ) {
-                throw new IllegalArgumentException("impressionsQueueSize must be > 0: " + _impressionsQueueSize);
-            }
-
-            if (_connectionTimeout <= 0) {
-                throw new IllegalArgumentException("connectionTimeOutInMs must be > 0: " + _connectionTimeout);
-            }
-
-            if (_readTimeout <= 0) {
-                throw new IllegalArgumentException("readTimeout must be > 0: " + _readTimeout);
+            if(_telemetryRefreshRate < 60) {
+                throw new IllegalStateException("_telemetryRefreshRate must be >= 60");
             }
+        }
 
+        private void verifyEndPoints() {
             if (_endpoint == null) {
                 throw new IllegalArgumentException("endpoint must not be null");
             }
@@ -1040,18 +1021,6 @@ public SplitClientConfig build() {
                 throw new IllegalArgumentException("If endpoint is set, you must also set the events endpoint");
             }
 
-            if (_numThreadsForSegmentFetch <= 0) {
-                throw new IllegalArgumentException("Number of threads for fetching segments MUST be greater than zero");
-            }
-
-            if (_authRetryBackoffBase <= 0) {
-                throw new IllegalArgumentException("authRetryBackoffBase: must be >= 1");
-            }
-
-            if (_streamingReconnectBackoffBase <= 0) {
-                throw new IllegalArgumentException("streamingReconnectBackoffBase: must be >= 1");
-            }
-
             if (_authServiceURL == null) {
                 throw new IllegalArgumentException("authServiceURL must not be null");
             }
@@ -1063,31 +1032,83 @@ public SplitClientConfig build() {
             if (_telemetryURl == null) {
                 throw new IllegalArgumentException("telemetryURl must not be null");
             }
+        }
 
-            if (_onDemandFetchRetryDelayMs <= 0) {
-                throw new IllegalStateException("streamingRetryDelay must be > 0");
+        private void verifyAllModes() {
+            switch (_impressionsMode) {
+                case OPTIMIZED:
+                    _impressionsRefreshRate = (_impressionsRefreshRate <= 0) ? 300 : Math.max(60, _impressionsRefreshRate);
+                    break;
+                case DEBUG:
+                    _impressionsRefreshRate = (_impressionsRefreshRate <= 0) ? 60 : _impressionsRefreshRate;
+                    break;
+                case NONE:
+                    break;
             }
 
-            if(_onDemandFetchMaxRetries <= 0) {
-                throw new IllegalStateException("_onDemandFetchMaxRetries must be > 0");
+            if (_impressionsQueueSize <=0 ) {
+                throw new IllegalArgumentException("impressionsQueueSize must be > 0: " + _impressionsQueueSize);
             }
-
             if(_storageMode == null) {
                 _storageMode = StorageMode.MEMORY;
             }
-
-            if(_telemetryRefreshRate < 60) {
-                throw new IllegalStateException("_telemetryRefreshRate must be >= 60");
-            }
 
             if(OperationMode.CONSUMER.equals(_operationMode)){
                 if(_customStorageWrapper == null) {
                     throw new IllegalStateException("Custom Storage must not be null on Consumer mode.");
                 }
                 _storageMode = StorageMode.PLUGGABLE;
             }
+        }
+
+        private void verifyNetworkParams() {
+            if (_connectionTimeout <= 0) {
+                throw new IllegalArgumentException("connectionTimeOutInMs must be > 0: " + _connectionTimeout);
+            }
+
+            if (_readTimeout <= 0) {
+                throw new IllegalArgumentException("readTimeout must be > 0: " + _readTimeout);
+            }
+            if (_authRetryBackoffBase <= 0) {
+                throw new IllegalArgumentException("authRetryBackoffBase: must be >= 1");
+            }
+
+            if (_streamingReconnectBackoffBase <= 0) {
+                throw new IllegalArgumentException("streamingReconnectBackoffBase: must be >= 1");
+            }
+
+            if (_onDemandFetchRetryDelayMs <= 0) {
+                throw new IllegalStateException("streamingRetryDelay must be > 0");
+            }
+
+            if(_onDemandFetchMaxRetries <= 0) {
+                throw new IllegalStateException("_onDemandFetchMaxRetries must be > 0");
+            }
+        }
+
+        private void verifyAlternativeClient() {
+            if (_alternativeHTTPModule != null && _streamingEnabled) {
+                throw new IllegalArgumentException("Streaming feature is not supported with Alternative HTTP Client");
+            }
+        }
+
+        public SplitClientConfig build() {
+
+            verifyRates();
+
+            verifyAllModes();
+
+            verifyEndPoints();
+
+            verifyNetworkParams();
+
+            verifyAlternativeClient();
+
+            if (_numThreadsForSegmentFetch <= 0) {
+                throw new IllegalArgumentException("Number of threads for fetching segments MUST be greater than zero");
+            }
 
-            return new SplitClientConfig(
+                return new SplitClientConfig(
                     _endpoint,
                     _eventsEndpoint,
                     _featuresRefreshRate,
@@ -1140,7 +1161,7 @@ public SplitClientConfig build() {
                     _flagSetsFilter,
                     _invalidSetsCount,
                     _customHeaderDecorator,
-                    _authScheme);
+                    _alternativeHTTPModule);
         }
     }
 }

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

@@ -2,6 +2,7 @@
 
 import io.split.inputValidation.ApiKeyValidator;
 import io.split.grammar.Treatments;
+import io.split.service.SplitHttpClient;
 import io.split.storages.enums.StorageMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;