Converted reserved headers to lower to have case insesitive check, and polishing.

Author: Bilal Al

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

@@ -51,7 +51,7 @@ private HttpSegmentChangeFetcher(SplitHttpClient client, URI uri, TelemetryRunti
     public SegmentChange fetch(String segmentName, long since, FetchOptions options) {
         long start = System.currentTimeMillis();
 
-        SplitHttpResponse response = null;
+        SplitHttpResponse response;
 
         try {
             String path = _target.getPath() + "/" + segmentName;
@@ -65,16 +65,15 @@ public SegmentChange fetch(String segmentName, long since, FetchOptions options)
             URI uri = uriBuilder.build();
 
             response = _client.get(uri, options);
-            int statusCode = response.statusCode;
 
-            if (statusCode < HttpStatus.SC_OK || statusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
-                _telemetryRuntimeProducer.recordSyncError(ResourceEnum.SEGMENT_SYNC, statusCode);
-                if (statusCode == HttpStatus.SC_FORBIDDEN) {
+            if (response.statusCode < HttpStatus.SC_OK || response.statusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
+                _telemetryRuntimeProducer.recordSyncError(ResourceEnum.SEGMENT_SYNC, response.statusCode);
+                if (response.statusCode == HttpStatus.SC_FORBIDDEN) {
                     _log.error("factory instantiation: you passed a client side type sdkKey, " +
                             "please grab an sdk key from the Split user interface that is of type server side");
                 }
                 throw new IllegalStateException(String.format("Could not retrieve segment changes for %s, since %s; http return code %s",
-                        segmentName, since, statusCode));
+                        segmentName, since, response.statusCode));
             }
             _telemetryRuntimeProducer.recordSuccessfulSync(LastSynchronizationRecordsEnum.SEGMENTS, System.currentTimeMillis());
 
@@ -85,8 +84,6 @@ public SegmentChange fetch(String segmentName, long since, FetchOptions options)
         } finally {
             _telemetryRuntimeProducer.recordSyncLatency(HTTPLatenciesEnum.SEGMENTS, System.currentTimeMillis()-start);
         }
-
-
     }
 
     @VisibleForTesting

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

@@ -70,15 +70,13 @@ public SplitChange fetch(long since, FetchOptions options) {
             URI uri = uriBuilder.build();
             response = _client.get(uri, options);
 
-            int statusCode = response.statusCode;
-
-            if (statusCode < HttpStatus.SC_OK || statusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
-                if (statusCode == HttpStatus.SC_REQUEST_URI_TOO_LONG) {
+            if (response.statusCode < HttpStatus.SC_OK || response.statusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
+                if (response.statusCode == HttpStatus.SC_REQUEST_URI_TOO_LONG) {
                     _log.error("The amount of flag sets provided are big causing uri length error.");
-                    throw new UriTooLongException(String.format("Status code: %s. Message: %s", statusCode, response.statusMessage));
+                    throw new UriTooLongException(String.format("Status code: %s. Message: %s", response.statusCode, response.statusMessage));
                 }
-                _telemetryRuntimeProducer.recordSyncError(ResourceEnum.SPLIT_SYNC, statusCode);
-                throw new IllegalStateException(String.format("Could not retrieve splitChanges since %s; http return code %s", since, statusCode));
+                _telemetryRuntimeProducer.recordSyncError(ResourceEnum.SPLIT_SYNC, response.statusCode);
+                throw new IllegalStateException(String.format("Could not retrieve splitChanges since %s; http return code %s", since, response.statusCode));
             }
 
             return Json.fromJson(response.body, SplitChange.class);

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

@@ -19,18 +19,18 @@ public final class RequestDecorator {
     UserCustomHeaderDecorator _headerDecorator;
 
     private static final Set<String> forbiddenHeaders = new HashSet<>(Arrays.asList(
-            "SplitSDKVersion",
-            "SplitMachineIp",
-            "SplitMachineName",
-            "SplitImpressionsMode",
-            "Host",
-            "Referrer",
-            "Content-Type",
-            "Content-Length",
-            "Content-Encoding",
-            "Accept",
-            "Keep-Alive",
-            "X-Fastly-Debug"
+            "splitsdkversion",
+            "splitmachineip",
+            "splitmachinename",
+            "splitimpressionsmode",
+            "host",
+            "referrer",
+            "content-type",
+            "content-length",
+            "content-encoding",
+            "accept",
+            "keep-alive",
+            "x-fastly-debug"
     ));
 
     public RequestDecorator(UserCustomHeaderDecorator headerDecorator) {
@@ -55,6 +55,6 @@ public HttpUriRequestBase decorateHeaders(HttpUriRequestBase request) {
     }
 
     private boolean isHeaderAllowed(String headerName) {
-        return !forbiddenHeaders.contains(headerName);
+        return !forbiddenHeaders.contains(headerName.toLowerCase());
     }
 }

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

@@ -155,7 +155,6 @@ public class SplitFactoryImpl implements SplitFactory {
     private final SplitSynchronizationTask _splitSynchronizationTask;
     private final EventsTask _eventsTask;
     private final SyncManager _syncManager;
-    private final CloseableHttpClient _httpclient;
     private final SplitHttpClient _splitHttpClient;
     private final UserStorageWrapper _userStorageWrapper;
     private final ImpressionsSender _impressionsSender;
@@ -186,9 +185,7 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
         _gates = new SDKReadinessGates();
 
         // HttpClient
-        _httpclient = buildHttpClient(apiToken, config, _sdkMetadata);
-        UserCustomHeaderDecorator _userCustomHeaderDecorator = config.userCustomHeaderDecorator();
-        _splitHttpClient = SplitHttpClientImpl.create(_httpclient, new RequestDecorator(_userCustomHeaderDecorator));
+        _splitHttpClient = buildSplitHttpClient(apiToken, config, _sdkMetadata);
 
         // Roots
         _rootTarget = URI.create(config.endpoint());
@@ -279,7 +276,6 @@ protected SplitFactoryImpl(String apiToken, SplitClientConfig config, CustomStor
         _splitFetcher = null;
         _splitSynchronizationTask = null;
         _eventsTask = null;
-        _httpclient = null;
         _splitHttpClient = null;
         _rootTarget = null;
         _eventsRootTarget = null;
@@ -361,7 +357,6 @@ protected SplitFactoryImpl(SplitClientConfig config) {
         _telemetrySynchronizer = null;
         _telemetrySyncTask = null;
         _eventsTask = null;
-        _httpclient = null;
         _splitHttpClient = null;
         _impressionsSender = null;
         _rootTarget = null;
@@ -478,7 +473,7 @@ public boolean isDestroyed() {
         return isTerminated;
     }
 
-    private static CloseableHttpClient buildHttpClient(String apiToken, SplitClientConfig config, SDKMetadata sdkMetadata) {
+    private static SplitHttpClient buildSplitHttpClient(String apiToken, SplitClientConfig config, SDKMetadata sdkMetadata) throws URISyntaxException {
         SSLConnectionSocketFactory sslSocketFactory = SSLConnectionSocketFactoryBuilder.create()
                 .setSslContext(SSLContexts.createSystemDefault())
                 .setTlsVersions(TLS.V_1_1, TLS.V_1_2)
@@ -512,7 +507,7 @@ private static CloseableHttpClient buildHttpClient(String apiToken, SplitClientC
             httpClientbuilder = setupProxy(httpClientbuilder, config);
         }
 
-        return httpClientbuilder.build();
+        return SplitHttpClientImpl.create(httpClientbuilder.build(), new RequestDecorator(config.userCustomHeaderDecorator()));
     }
 
     private static CloseableHttpClient buildSSEdHttpClient(String apiToken, SplitClientConfig config, SDKMetadata sdkMetadata) {

client/src/main/java/io/split/client/impressions/HttpImpressionsSender.java

@@ -71,10 +71,8 @@ public void postImpressionsBulk(List<TestImpressions> impressions) {
             additionalHeader.put(IMPRESSIONS_MODE_HEADER, _mode.toString());
             response = _client.post(_impressionBulkTarget, entity, additionalHeader);
 
-            int status = response.statusCode;
-
-            if (status < HttpStatus.SC_OK || status >= HttpStatus.SC_MULTIPLE_CHOICES) {
-                _telemetryRuntimeProducer.recordSyncError(ResourceEnum.IMPRESSION_SYNC, status);
+            if (response.statusCode < HttpStatus.SC_OK || response.statusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
+                _telemetryRuntimeProducer.recordSyncError(ResourceEnum.IMPRESSION_SYNC, response.statusCode);
             }
             _telemetryRuntimeProducer.recordSuccessfulSync(LastSynchronizationRecordsEnum.IMPRESSIONS, System.currentTimeMillis());
 
@@ -98,9 +96,8 @@ public void postCounters(HashMap<ImpressionCounter.Key, Integer> raw) {
                 Utils.toJsonEntity(ImpressionCount.fromImpressionCounterData(raw)),
                 null);
 
-            int status = response.statusCode;
-            if (status < HttpStatus.SC_OK || status >= HttpStatus.SC_MULTIPLE_CHOICES) {
-                _telemetryRuntimeProducer.recordSyncError(ResourceEnum.IMPRESSION_COUNT_SYNC, status);
+            if (response.statusCode < HttpStatus.SC_OK || response.statusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
+                _telemetryRuntimeProducer.recordSyncError(ResourceEnum.IMPRESSION_COUNT_SYNC, response.statusCode);
             }
             _telemetryRuntimeProducer.recordSyncLatency(HTTPLatenciesEnum.IMPRESSIONS_COUNT, System.currentTimeMillis() - initTime);
             _telemetryRuntimeProducer.recordSuccessfulSync(LastSynchronizationRecordsEnum.IMPRESSIONS_COUNT, System.currentTimeMillis());

client/src/main/java/io/split/service/HttpPostImp.java

@@ -8,7 +8,6 @@
 import org.apache.hc.core5.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.hc.client5.http.classic.methods.HttpPost;
 
 import java.net.URI;
 
@@ -28,18 +27,14 @@ public void post(URI uri, Object object, String posted, HttpParamsWrapper httpPa
         long initTime = System.currentTimeMillis();
         HttpEntity entity = Utils.toJsonEntity(object);
 
-        HttpPost request = new HttpPost(uri);
-        request.setEntity(entity);
-
         if (_logger.isDebugEnabled()) {
-            _logger.debug(String.format("[%s] %s", request.getMethod(), uri));
+            _logger.debug(String.format("[Post] %s", uri));
         }
 
         try {
             SplitHttpResponse response = _client.post(uri, entity, null);
-            int status = response.statusCode;
-            if (status < HttpStatus.SC_OK || status >= HttpStatus.SC_MULTIPLE_CHOICES) {
-                _telemetryRuntimeProducer.recordSyncError(httpParamsWrapper.getResourceEnum(), status);
+            if (response.statusCode < HttpStatus.SC_OK || response.statusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
+                _telemetryRuntimeProducer.recordSyncError(httpParamsWrapper.getResourceEnum(), response.statusCode);
                 return;
             }
             _telemetryRuntimeProducer.recordSyncLatency(httpParamsWrapper.getHttpLatenciesEnum(), System.currentTimeMillis() - initTime);

client/src/main/java/io/split/service/SplitHttpClientImpl.java

@@ -52,19 +52,17 @@ public SplitHttpResponse get(URI uri, FetchOptions options) {
 
             response = _client.execute(request);
 
-            int statusCode = response.getCode();
-
             if (_log.isDebugEnabled()) {
-                _log.debug(String.format("[%s] %s. Status code: %s", request.getMethod(), uri.toURL(), statusCode));
+                _log.debug(String.format("[%s] %s. Status code: %s", request.getMethod(), uri.toURL(), response.getCode()));
             }
 
             SplitHttpResponse httpResponse = new SplitHttpResponse();
             httpResponse.statusMessage = "";
-            if (statusCode < HttpStatus.SC_OK || statusCode >= HttpStatus.SC_MULTIPLE_CHOICES) {
-                _log.warn(String.format("Response status was: %s. Reason: %s", statusCode , response.getReasonPhrase()));
+            if (response.getCode() < HttpStatus.SC_OK || response.getCode() >= HttpStatus.SC_MULTIPLE_CHOICES) {
+                _log.warn(String.format("Response status was: %s. Reason: %s", response.getCode() , response.getReasonPhrase()));
                 httpResponse.statusMessage = response.getReasonPhrase();
             }
-            httpResponse.statusCode = statusCode;
+            httpResponse.statusCode = response.getCode();
             httpResponse.body = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
             return httpResponse;
         } catch (Exception e) {

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

@@ -61,6 +61,18 @@ public Map<String, String> getHeaderOverrides() {
                 {{
                     put("first", "1");
                     put("SplitSDKVersion", "2.4");
+                    put("SplitMachineip", "xx");
+                    put("splitMachineName", "xx");
+                    put("splitimpressionsmode", "xx");
+                    put("HOST", "xx");
+                    put("referrer", "xx");
+                    put("content-type", "xx");
+                    put("content-length", "xx");
+                    put("content-encoding", "xx");
+                    put("ACCEPT", "xx");
+                    put("keep-alive", "xx");
+                    put("x-fastly-debug", "xx");
+
                 }};
             }
         }