Merge branch 'development' into feature/prerequisites

Author: chillaq

CHANGES.txt

@@ -1,3 +1,7 @@
+4.15.0 (Apr 18, 2025)
+- Prevent polling threads from starting when the SDK calls destroy method.
+- Added a new optional argument to the client `getTreatment` methods to allow passing additional evaluation options, such as a map of properties to append to the generated impressions sent to Split backend. Read more in our docs.
+
 4.14.0 (Jan 17, 2025)
 - Added support for the new impressions tracking toggle available on feature flags, both respecting the setting and including the new field being returned on SplitView type objects. Read more in our docs.
 - Cleaned unused imports to fix a collision issue.

client/pom.xml

@@ -5,9 +5,9 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.14.0</version>
+        <version>4.15.0</version>
     </parent>
-    <version>4.14.0</version>
+    <version>4.15.0</version>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>
     <name>Java Client</name>

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

@@ -6,7 +6,6 @@ private Spec() {
         // restrict instantiation
     }
 
-    // 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";
 }

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

@@ -33,7 +33,6 @@
 public final class HttpSplitChangeFetcher implements SplitChangeFetcher {
     private static final Logger _log = LoggerFactory.getLogger(HttpSplitChangeFetcher.class);
 
-    private final Object _lock = new Object();
     private static final String SINCE = "since";
     private static final String RB_SINCE = "rbSince";
     private static final String TILL = "till";

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

@@ -61,6 +61,7 @@ private SplitChange processSplitChange(SplitChange splitChange, long changeNumbe
             _log.warn("The till is lower than the change number or different to -1");
             return null;
         }
+      
         byte [] currHashFeatureFlags = getStringDigest(splitChange.featureFlags.d.toString());
         byte [] currHashRuleBasedSegments = getStringDigest(splitChange.ruleBasedSegments.d.toString());
         //if sha exist and is equal to before sha, or if till is equal to default till returns the same segmentChange with till equals to storage CN
@@ -79,10 +80,10 @@ private SplitChange processSplitChange(SplitChange splitChange, long changeNumbe
         return splitChangeToProcess;
     }
 
-    private byte[] getStringDigest(String Json) throws NoSuchAlgorithmException {
+    private byte[] getStringDigest(String json) throws NoSuchAlgorithmException {
         MessageDigest digest = MessageDigest.getInstance("SHA-1");
         digest.reset();
-        digest.update(Json.getBytes());
+        digest.update(json.getBytes());
         // calculate the json sha
         return digest.digest();
     }

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

@@ -70,12 +70,7 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
                 split.trafficAllocation = LocalhostConstants.SIZE_100;
                 split.trafficAllocationSeed = LocalhostConstants.SIZE_1;
 
-                Condition condition;
-                if (featureTreatment.length == 2) {
-                    condition = LocalhostSanitizer.createCondition(null, featureTreatment[1]);
-                } else {
-                    condition = LocalhostSanitizer.createCondition(featureTreatment[2], featureTreatment[1]);
-                }
+                Condition condition = checkCondition(featureTreatment);
                 if(condition.conditionType != ConditionType.ROLLOUT){
                     split.conditions.add(0, condition);
                 } else {
@@ -103,4 +98,14 @@ public SplitChange fetch(long since, long sinceRBS, FetchOptions options) {
             throw new IllegalStateException("Problem fetching splitChanges: " + e.getMessage(), e);
         }
     }
+
+    private Condition checkCondition(String[] featureTreatment) {
+        Condition condition;
+        if (featureTreatment.length == 2) {
+            condition = LocalhostSanitizer.createCondition(null, featureTreatment[1]);
+        } else {
+            condition = LocalhostSanitizer.createCondition(featureTreatment[2], featureTreatment[1]);
+        }
+        return condition;
+    }
 }

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

@@ -552,7 +552,7 @@ private String validateProperties(Map<String, Object> properties) {
 
          ImpressionPropertiesValidator.ImpressionPropertiesValidatorResult iPValidatorResult = ImpressionPropertiesValidator.propertiesAreValid(
                     properties);
-         return  new GsonBuilder().create().toJson(iPValidatorResult.getValue()).toString();
+         return  new GsonBuilder().create().toJson(iPValidatorResult.getValue());
     }
 
     private Map<String, SplitResult> getTreatmentsWithConfigInternal(String matchingKey, String bucketingKey, List<String> featureFlagNames,

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

@@ -130,7 +130,7 @@ public class SplitFactoryImpl implements SplitFactory {
     private static final org.slf4j.Logger _log = LoggerFactory.getLogger(SplitFactoryImpl.class);
     private static final String LEGACY_LOG_MESSAGE = "The sdk initialize in localhost mode using Legacy file. The splitFile or "
             +
-            "inputStream doesn't add it to the config.";
+            "inputStream are not added to the config.";
     private final static long SSE_CONNECT_TIMEOUT = 30000;
     private final static long SSE_SOCKET_TIMEOUT = 70000;
 
@@ -403,7 +403,7 @@ protected SplitFactoryImpl(SplitClientConfig config) {
         SegmentCache segmentCache = new SegmentCacheInMemoryImpl();
         FlagSetsFilter flagSetsFilter = new FlagSetsFilterImpl(config.getSetsFilter());
         SplitCache splitCache = new InMemoryCacheImp(flagSetsFilter);
-        RuleBasedSegmentCache _ruleBasedSegmentCache = new RuleBasedSegmentCacheInMemoryImp();
+        RuleBasedSegmentCache ruleBasedSegmentCache = new RuleBasedSegmentCacheInMemoryImp();
         _splitCache = splitCache;
         _gates = new SDKReadinessGates();
         _segmentCache = segmentCache;
@@ -422,15 +422,15 @@ protected SplitFactoryImpl(SplitClientConfig config) {
                 _telemetryStorageProducer,
                 _splitCache,
                 config.getThreadFactory(),
-                _ruleBasedSegmentCache);
+                ruleBasedSegmentCache);
 
         // SplitFetcher
         SplitChangeFetcher splitChangeFetcher = createSplitChangeFetcher(config);
         SplitParser splitParser = new SplitParser();
         RuleBasedSegmentParser ruleBasedSegmentParser = new RuleBasedSegmentParser();
 
         _splitFetcher = new SplitFetcherImp(splitChangeFetcher, splitParser, splitCache, _telemetryStorageProducer,
-                flagSetsFilter, ruleBasedSegmentParser, _ruleBasedSegmentCache);
+                flagSetsFilter, ruleBasedSegmentParser, ruleBasedSegmentCache);
 
         // SplitSynchronizationTask
         _splitSynchronizationTask = new SplitSynchronizationTask(_splitFetcher, splitCache,
@@ -442,7 +442,7 @@ protected SplitFactoryImpl(SplitClientConfig config) {
                 _impressionsManager, null, null, null);
 
         // Evaluator
-        _evaluator = new EvaluatorImp(splitCache, segmentCache, _ruleBasedSegmentCache);
+        _evaluator = new EvaluatorImp(splitCache, segmentCache, ruleBasedSegmentCache);
 
         EventsStorage eventsStorage = new NoopEventsStorageImp();
 

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

@@ -1,6 +1,5 @@
 package io.split.client.dtos;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class ChangeDto<T> {

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

@@ -10,5 +10,5 @@ public EvaluationOptions(Map<String, Object> properties) {
     }
     public Map<String, Object> getProperties() {
         return _properties;
-    };
+    }
 }