removed spec_version global var

Author: chillaq

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

@@ -9,6 +9,5 @@ private Spec() {
     // TODO: Change the schema to 1.3 when updating splitclient
     public static final String SPEC_1_3 = "1.3";
     public static final String SPEC_1_1 = "1.1";
-    public static String SPEC_VERSION = SPEC_1_3;
 }
 

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

@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.split.Spec.SPEC_VERSION;
 import static io.split.Spec.SPEC_1_3;
 import static io.split.Spec.SPEC_1_1;
 
@@ -44,6 +43,7 @@ public final class HttpSplitChangeFetcher implements SplitChangeFetcher {
     private static final String TILL = "till";
     private static final String SETS = "sets";
     private static final String SPEC = "s";
+    private String specVersion = SPEC_1_3;
     private int PROXY_CHECK_INTERVAL_MILLISECONDS_SS =  24 * 60 * 60 * 1000;
     private Long _lastProxyCheckTimestamp = 0L;
     private final SplitHttpClient _client;
@@ -75,9 +75,9 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
         long start = System.currentTimeMillis();
         SplitHttpResponse response;
         try {
-            if (SPEC_VERSION.equals(SPEC_1_1) && (System.currentTimeMillis() - _lastProxyCheckTimestamp >= PROXY_CHECK_INTERVAL_MILLISECONDS_SS)) {
+            if (specVersion.equals(SPEC_1_1) && (System.currentTimeMillis() - _lastProxyCheckTimestamp >= PROXY_CHECK_INTERVAL_MILLISECONDS_SS)) {
                 _log.info("Switching to new Feature flag spec ({}) and fetching.", SPEC_1_3);
-                SPEC_VERSION = SPEC_1_3;
+                specVersion = SPEC_1_3;
             }
             URI uri = buildURL(options, since, sinceRBS);
             response = _client.get(uri, options, null);
@@ -87,12 +87,12 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
                     throw new UriTooLongException(String.format("Status code: %s. Message: %s", response.statusCode(), response.statusMessage()));
                 }
 
-                if (response.statusCode() == HttpStatus.SC_BAD_REQUEST && SPEC_VERSION.equals(Spec.SPEC_1_3) && _rootURIOverriden) {
-                    SPEC_VERSION = Spec.SPEC_1_1;
+                if (response.statusCode() == HttpStatus.SC_BAD_REQUEST && specVersion.equals(Spec.SPEC_1_3) && _rootURIOverriden) {
+                    specVersion = Spec.SPEC_1_1;
                     _log.warn("Detected proxy without support for Feature flags spec {} version, will switch to spec version {}",
                             SPEC_1_3, SPEC_1_1);
                     _lastProxyCheckTimestamp = System.currentTimeMillis();
-                    return fetch(since, sinceRBS, options);
+                    return fetch(since, 0, options);
                 }
 
                 _telemetryRuntimeProducer.recordSyncError(ResourceEnum.SPLIT_SYNC, response.statusCode());
@@ -106,11 +106,12 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
             _telemetryRuntimeProducer.recordSyncLatency(HTTPLatenciesEnum.SPLITS, System.currentTimeMillis() - start);
         }
 
-        if (SPEC_VERSION.equals(Spec.SPEC_1_1)) {
+        String body = response.body();
+        if (specVersion.equals(Spec.SPEC_1_1)) {
             return Json.fromJson(body, SplitChangesOldPayloadDto.class).toSplitChange();
         }
 
-        return Json.fromJson(response.body(), SplitChange.class);
+        return Json.fromJson(body, SplitChange.class);
     }
 
     public Long getLastProxyCheckTimestamp() {
@@ -132,7 +133,7 @@ private ChangeDto<RuleBasedSegment> createEmptyDTO() {
     }
 
     private URI buildURL(FetchOptions options, long since, long sinceRBS) throws URISyntaxException {
-        URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION);
+        URIBuilder uriBuilder = new URIBuilder(_target).addParameter(SPEC, "" + specVersion);
         uriBuilder.addParameter(SINCE, "" + since);
         uriBuilder.addParameter(RB_SINCE, "" + sinceRBS);
         if (!options.flagSetsFilter().isEmpty()) {

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

@@ -225,7 +225,7 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
         RuleBasedSegmentParser ruleBasedSegmentParser = new RuleBasedSegmentParser();
         // SplitFetcher
         _splitFetcher = buildSplitFetcher(splitCache, splitParser, flagSetsFilter,
-                ruleBasedSegmentParser, ruleBasedSegmentCache, config.isRootURIOverriden());
+                ruleBasedSegmentParser, ruleBasedSegmentCache, config.isSdkEndpointOverridden());
 
         // SplitSynchronizationTask
         _splitSynchronizationTask = new SplitSynchronizationTask(_splitFetcher,

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

@@ -2,6 +2,7 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class SplitChangesOldPayloadDto {
@@ -25,8 +26,8 @@ public SplitChange toSplitChange() {
         rbs.t = -1;
         rbs.s = -1;
 
-        splitChange.ff = ff;
-        splitChange.rbs = rbs;
+        splitChange.featureFlags = ff;
+        splitChange.ruleBasedSegments = rbs;
 
         return splitChange;
     }

client/src/main/java/io/split/engine/sse/AuthApiClientImp.java

@@ -1,6 +1,7 @@
 package io.split.engine.sse;
 
 import com.google.gson.JsonObject;
+import io.split.Spec;
 import io.split.client.dtos.SplitHttpResponse;
 import io.split.client.utils.Json;
 import io.split.engine.common.FetchOptions;
@@ -18,7 +19,6 @@
 import java.net.URI;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.split.Spec.SPEC_VERSION;
 
 public class AuthApiClientImp implements AuthApiClient {
     private static final Logger _log = LoggerFactory.getLogger(AuthApiClientImp.class);
@@ -38,7 +38,7 @@ public AuthApiClientImp(String url, SplitHttpClient httpClient, TelemetryRuntime
     public AuthenticationResponse Authenticate() {
         try {
             long initTime = System.currentTimeMillis();
-            URI uri = new URIBuilder(_target).addParameter(SPEC, "" + SPEC_VERSION).build();
+            URI uri = new URIBuilder(_target).addParameter(SPEC, "" + Spec.SPEC_1_3).build();
             SplitHttpResponse response = _httpClient.get(uri, new FetchOptions.Builder().cacheControlHeaders(false).build(), null);
             Integer statusCode = response.statusCode();
 

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

@@ -198,7 +198,6 @@ public void testURLTooLong() throws IOException, URISyntaxException, IllegalAcce
     @Test
     public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTargetException,
             NoSuchMethodException, IllegalAccessException, IOException, NoSuchFieldException, InterruptedException {
-        Spec.SPEC_VERSION = Spec.SPEC_1_3;
         URI rootTarget = URI.create("https://api.split.io");
         CloseableHttpClient httpClientMock = Mockito.mock(CloseableHttpClient.class);
         HttpEntity entityMock = Mockito.mock(HttpEntity.class);
@@ -247,9 +246,12 @@ public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTarget
         HttpSplitChangeFetcher fetcher = HttpSplitChangeFetcher.create(splitHtpClient, rootTarget,
                 Mockito.mock(TelemetryRuntimeProducer.class), true);
 
+        Field specVersion = fetcher.getClass().getDeclaredField("specVersion");
+        specVersion.setAccessible(true);
+        specVersion.set(fetcher, Spec.SPEC_1_1);
+
         SplitChange change = fetcher.fetch(-1, -1, new FetchOptions.Builder().cacheControlHeaders(true).build());
 
-        Assert.assertEquals(Spec.SPEC_1_1, Spec.SPEC_VERSION);
         List<ClassicHttpRequest> captured = requestCaptor.getAllValues();
         Assert.assertEquals(captured.size(), 2);
         Assert.assertTrue(captured.get(0).getUri().toString().contains("s=1.3"));
@@ -271,7 +273,6 @@ public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTarget
         Thread.sleep(1000);
         change = fetcher.fetch(-1, -1, new FetchOptions.Builder().cacheControlHeaders(true).build());
 
-        Assert.assertEquals(Spec.SPEC_1_1, Spec.SPEC_VERSION);
         Assert.assertTrue(captured.get(2).getUri().toString().contains("s=1.3"));
         Assert.assertTrue(captured.get(3).getUri().toString().contains("s=1.1"));
         Assert.assertEquals(122, change.featureFlags.s);
@@ -283,7 +284,6 @@ public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTarget
         // test if proxy is upgraded and spec 1.3 now works.
         Thread.sleep(1000);
         change = fetcher.fetch(-1, -1, new FetchOptions.Builder().cacheControlHeaders(true).build());
-        Assert.assertEquals(Spec.SPEC_1_3, Spec.SPEC_VERSION);
         Assert.assertTrue(captured.get(4).getUri().toString().contains("s=1.3"));
         Assert.assertEquals(122, change.featureFlags.s);
         Assert.assertEquals(123, change.featureFlags.t);

client/src/test/java/io/split/engine/segments/SegmentSynchronizationTaskImpTest.java

@@ -171,7 +171,6 @@ public void testLocalhostSegmentChangeFetcher() throws InterruptedException, Fil
             ruleBasedSegmentParser, ruleBasedSegmentCacheProducer);
 
         SplitSynchronizationTask splitSynchronizationTask = new SplitSynchronizationTask(splitFetcher, splitCacheProducer, 1000, null);
-        Spec.SPEC_VERSION = Spec.SPEC_1_1; // check old spec
 
         splitSynchronizationTask.start();