polish

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

@@ -22,7 +22,7 @@
 import java.net.URISyntaxException;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.split.Spec.SPEC_VERSION;
+import static io.split.Spec.SPEC_1_3;
 
 /**
  * Created by adilaijaz on 5/30/15.
@@ -35,6 +35,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 final SplitHttpClient _client;
     private final URI _target;
     private final TelemetryRuntimeProducer _telemetryRuntimeProducer;
@@ -83,7 +84,7 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
     }
 
     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/JsonLocalhostSplitChangeFetcher.java

@@ -1,7 +1,6 @@
 package io.split.client;
 
 import com.google.gson.stream.JsonReader;
-import io.split.client.dtos.ChangeDto;
 import io.split.client.dtos.SplitChange;
 import io.split.client.utils.InputStreamProvider;
 import io.split.client.utils.Json;
@@ -17,9 +16,10 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
 import java.util.Arrays;
 
+import static io.split.client.utils.Utils.checkExitConditions;
+
 public class JsonLocalhostSplitChangeFetcher implements SplitChangeFetcher {
 
     private static final Logger _log = LoggerFactory.getLogger(JsonLocalhostSplitChangeFetcher.class);
@@ -70,10 +70,6 @@ private SplitChange processSplitChange(SplitChange splitChange, long changeNumbe
         return splitChangeToProcess;
     }
 
-    private <T> boolean checkExitConditions(ChangeDto<T> change, long cn) {
-        return change.t < cn && change.t != -1;
-    }
-
     private byte[] getStringDigest(String Json) throws NoSuchAlgorithmException {
         MessageDigest digest = MessageDigest.getInstance("SHA-1");
         digest.reset();

client/src/main/java/io/split/client/utils/Utils.java

@@ -1,5 +1,6 @@
 package io.split.client.utils;
 
+import io.split.client.dtos.ChangeDto;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpEntity;
@@ -40,4 +41,8 @@ public static URI appendPath(URI root, String pathToAppend) throws URISyntaxExce
         String path = String.format("%s%s%s", root.getPath(), root.getPath().endsWith("/") ? "" : "/", pathToAppend);
         return new URIBuilder(root).setPath(path).build();
     }
+
+    public static <T> boolean checkExitConditions(ChangeDto<T> change, long cn) {
+        return change.t < cn && change.t != -1;
+    }
 }

client/src/main/java/io/split/engine/experiments/SplitFetcherImp.java

@@ -1,8 +1,5 @@
 package io.split.engine.experiments;
 
-import io.split.client.dtos.ChangeDto;
-import io.split.client.dtos.RuleBasedSegment;
-import io.split.client.dtos.Split;
 import io.split.client.dtos.SplitChange;
 import io.split.client.exceptions.UriTooLongException;
 import io.split.client.interceptors.FlagSetsFilter;
@@ -22,6 +19,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static io.split.client.utils.FeatureFlagProcessor.processFeatureFlagChanges;
 import static io.split.client.utils.RuleBasedSegmentProcessor.processRuleBasedSegmentChanges;
+import static io.split.client.utils.Utils.checkExitConditions;
 
 /**
  * An ExperimentFetcher that refreshes experiment definitions periodically.
@@ -163,8 +161,4 @@ private Set<String> runWithoutExceptionHandling(FetchOptions options) throws Int
 
         return segments;
     }
-
-    private <T> boolean checkExitConditions(ChangeDto<T> change, long cn) {
-        return change.s != cn || change.t < cn;
-    }
 }

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

@@ -199,7 +199,6 @@ public void testURLTooLong() throws IOException, URISyntaxException, IllegalAcce
     @Test
     public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTargetException,
             NoSuchMethodException, IllegalAccessException, IOException {
-        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);
@@ -225,7 +224,6 @@ public void testSwitchingToOldSpec() throws URISyntaxException, InvocationTarget
 
         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"));

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();