polish

Author: chillaq

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

@@ -100,12 +100,10 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
             if (specVersion.equals(Spec.SPEC_1_1)) {
                 return Json.fromJson(response.body(), SplitChangesOldPayloadDto.class).toSplitChange();
             }
-                if (_lastProxyCheckTimestamp != 0) {
-                    splitChange.clearCache = true;
-                    _lastProxyCheckTimestamp = 0L;
-                }
-                splitChange = Json.fromJson(response.body(), SplitChange.class);
-            }
+
+            SplitChange splitChange = Json.fromJson(response.body(), SplitChange.class);
+            splitChange.clearCache = _lastProxyCheckTimestamp != 0;
+            _lastProxyCheckTimestamp = 0L;
             return splitChange;
         } catch (Exception e) {
             throw new IllegalStateException(String.format("Problem fetching splitChanges since %s: %s", since, e), e);

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

@@ -7,12 +7,4 @@ public class ChangeDto<T> {
     public long s;
     public long t;
     public List<T> d;
-
-    public static ChangeDto createEmptyDto() {
-        ChangeDto dto = new ChangeDto<>();
-        dto.d = new ArrayList<>();
-        dto.t = -1;
-        dto.s = -1;
-        return dto;
-    }
 }

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

@@ -147,7 +147,7 @@ private Set<String> runWithoutExceptionHandling(FetchOptions options) throws Int
 
         synchronized (_lock) {
             // check state one more time.
-            if (checkExitConditions(change.featureFlags, _splitCacheProducer.getChangeNumber()) &&
+            if (checkExitConditions(change.featureFlags, _splitCacheProducer.getChangeNumber()) ||
                     checkExitConditions(change.ruleBasedSegments, _ruleBasedSegmentCacheProducer.getChangeNumber())) {
                 // some other thread may have updated the shared state. exit
                 return segments;