Adding redis modules

client/pom.xml

@@ -11,6 +11,11 @@
     <packaging>jar</packaging>
     <name>Java Client</name>
     <description>Java SDK for Split</description>
+
+    <properties>
+        <pluggable.storage>1.0.0</pluggable.storage>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -118,6 +123,12 @@
         </resources>
     </build>
     <dependencies>
+        <dependency>
+            <groupId>io.split.client</groupId>
+            <artifactId>pluggable-storage</artifactId>
+            <version>${pluggable.storage}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

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

@@ -6,8 +6,8 @@
 import io.split.integrations.IntegrationsConfig;
 import io.split.storages.enums.OperationMode;
 import io.split.storages.enums.StorageMode;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import org.apache.hc.core5.http.HttpHost;
+import pluggable.CustomStorageWrapper;
 
 import java.io.IOException;
 import java.util.Properties;

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

@@ -18,37 +18,33 @@
 import io.split.client.interceptors.GzipEncoderRequestInterceptor;
 import io.split.client.interceptors.SdkMetadataInterceptorFilter;
 import io.split.client.utils.SDKMetadata;
-import io.split.storages.SegmentCacheConsumer;
-import io.split.storages.SegmentCacheProducer;
-import io.split.storages.SplitCacheConsumer;
-import io.split.storages.SplitCacheProducer;
-import io.split.storages.enums.OperationMode;
-import io.split.storages.enums.StorageMode;
-import io.split.storages.memory.InMemoryCacheImp;
-import io.split.storages.SplitCache;
-import io.split.engine.evaluator.Evaluator;
-import io.split.engine.evaluator.EvaluatorImp;
 import io.split.engine.SDKReadinessGates;
 import io.split.engine.common.SyncManager;
 import io.split.engine.common.SyncManagerImp;
+import io.split.engine.evaluator.Evaluator;
+import io.split.engine.evaluator.EvaluatorImp;
 import io.split.engine.experiments.SplitChangeFetcher;
 import io.split.engine.experiments.SplitFetcher;
 import io.split.engine.experiments.SplitFetcherImp;
 import io.split.engine.experiments.SplitParser;
 import io.split.engine.experiments.SplitSynchronizationTask;
 import io.split.engine.segments.SegmentChangeFetcher;
-import io.split.storages.SegmentCache;
-import io.split.storages.memory.SegmentCacheInMemoryImpl;
 import io.split.engine.segments.SegmentSynchronizationTaskImp;
 import io.split.integrations.IntegrationsConfig;
-import io.split.storages.pluggable.CustomStorageWrapper;
+import io.split.storages.SegmentCache;
+import io.split.storages.SegmentCacheConsumer;
+import io.split.storages.SegmentCacheProducer;
+import io.split.storages.SplitCache;
+import io.split.storages.SplitCacheConsumer;
+import io.split.storages.SplitCacheProducer;
+import io.split.storages.enums.OperationMode;
+import io.split.storages.memory.InMemoryCacheImp;
+import io.split.storages.memory.SegmentCacheInMemoryImpl;
 import io.split.storages.pluggable.adapters.UserCustomEventAdapterProducer;
 import io.split.storages.pluggable.adapters.UserCustomImpressionAdapterConsumer;
 import io.split.storages.pluggable.adapters.UserCustomImpressionAdapterProducer;
 import io.split.storages.pluggable.adapters.UserCustomSegmentAdapterConsumer;
-import io.split.storages.pluggable.adapters.UserCustomSegmentAdapterProducer;
 import io.split.storages.pluggable.adapters.UserCustomSplitAdapterConsumer;
-import io.split.storages.pluggable.adapters.UserCustomSplitAdapterProducer;
 import io.split.storages.pluggable.adapters.UserCustomTelemetryAdapterProducer;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
 import io.split.storages.pluggable.synchronizer.TelemetryConsumerSubmitter;
@@ -79,12 +75,12 @@
 import org.apache.hc.core5.util.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import pluggable.CustomStorageWrapper;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;

client/src/main/java/io/split/storages/pluggable/adapters/UserCustomEventAdapterProducer.java

@@ -4,10 +4,10 @@
 import io.split.client.dtos.Metadata;
 import io.split.client.events.EventsStorageProducer;
 import io.split.client.utils.Json;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.EventConsumer;
 import io.split.storages.pluggable.domain.PrefixAdapter;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
+import pluggable.CustomStorageWrapper;
 
 import java.util.List;
 import java.util.stream.Collectors;

client/src/main/java/io/split/storages/pluggable/adapters/UserCustomImpressionAdapterProducer.java

@@ -7,10 +7,10 @@
 import io.split.client.dtos.KeyImpression;
 import io.split.client.dtos.Metadata;
 import io.split.client.impressions.ImpressionsStorageProducer;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.ImpressionConsumer;
 import io.split.storages.pluggable.domain.PrefixAdapter;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
+import pluggable.CustomStorageWrapper;
 
 import java.lang.reflect.Modifier;
 import java.util.Collections;

client/src/main/java/io/split/storages/pluggable/adapters/UserCustomSegmentAdapterConsumer.java

@@ -1,10 +1,10 @@
 package io.split.storages.pluggable.adapters;
 
 import io.split.storages.SegmentCacheConsumer;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.PrefixAdapter;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
 import io.split.storages.pluggable.utils.Helper;
+import pluggable.CustomStorageWrapper;
 
 import java.util.Set;
 

client/src/main/java/io/split/storages/pluggable/adapters/UserCustomSegmentAdapterProducer.java

@@ -2,10 +2,10 @@
 
 import io.split.client.utils.Json;
 import io.split.storages.SegmentCacheProducer;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.PrefixAdapter;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
 import io.split.storages.pluggable.utils.Helper;
+import pluggable.CustomStorageWrapper;
 
 import java.util.List;
 

client/src/main/java/io/split/storages/pluggable/adapters/UserCustomSplitAdapterConsumer.java

@@ -5,12 +5,12 @@
 import io.split.engine.experiments.ParsedSplit;
 import io.split.engine.experiments.SplitParser;
 import io.split.storages.SplitCacheConsumer;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
 import io.split.storages.pluggable.domain.PrefixAdapter;
 import io.split.storages.pluggable.utils.Helper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import pluggable.CustomStorageWrapper;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -59,7 +59,6 @@ public Collection<ParsedSplit> getAll() {
         if(keys == null) {
             return new ArrayList<>();
         }
-        keys = keys.stream().map(k -> k = PrefixAdapter.buildSplitKey(k)).collect(Collectors.toSet());
         List<String> wrapperResponse = _safeUserStorageWrapper.getMany(new ArrayList<>(keys));
         if(wrapperResponse == null) {
             return new ArrayList<>();

client/src/main/java/io/split/storages/pluggable/adapters/UserCustomSplitAdapterProducer.java

@@ -4,12 +4,12 @@
 import io.split.client.utils.Json;
 import io.split.engine.experiments.ParsedSplit;
 import io.split.storages.SplitCacheProducer;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.PrefixAdapter;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
 import io.split.storages.pluggable.utils.Helper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import pluggable.CustomStorageWrapper;
 
 import java.util.HashSet;
 import java.util.List;

client/src/main/java/io/split/storages/pluggable/adapters/UserCustomTelemetryAdapterProducer.java

@@ -1,7 +1,6 @@
 package io.split.storages.pluggable.adapters;
 
 import io.split.client.utils.SDKMetadata;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.PrefixAdapter;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
 import io.split.telemetry.domain.StreamingEvent;
@@ -13,6 +12,7 @@
 import io.split.telemetry.domain.enums.ResourceEnum;
 import io.split.telemetry.storage.TelemetryStorageProducer;
 import io.split.telemetry.utils.BucketCalculator;
+import pluggable.CustomStorageWrapper;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

client/src/main/java/io/split/storages/pluggable/domain/PrefixAdapter.java

@@ -19,25 +19,25 @@ public class PrefixAdapter {
     private static final String INIT = "init";
 
     public static String buildSplitKey(String name) {
-        return String.format(DEFAULT_PREFIX+ SPLIT_PREFIX +"{%s}", name);
+        return String.format(DEFAULT_PREFIX+ SPLIT_PREFIX +"%s", name);
     }
 
     public static String buildSplitChangeNumber() {
         return DEFAULT_PREFIX+SPLITS_PREFIX+"till";
     }
 
     public static String buildGetAllSplit() {
-        return DEFAULT_PREFIX+SPLITS_PREFIX+"*";
+        return DEFAULT_PREFIX+SPLIT_PREFIX+"*";
     }
 
     public static String buildTrafficTypeExists(String trafficType) {
-        return String.format(DEFAULT_PREFIX+TRAFFIC_TYPE_PREFIX+"{%s}", trafficType);
+        return String.format(DEFAULT_PREFIX+TRAFFIC_TYPE_PREFIX+"%s", trafficType);
     }
 
     public static List<String> buildFetchManySplits(List<String> names) {
         List<String> prefixes = new ArrayList<>();
         for(String name : names) {
-            prefixes.add(String.format(DEFAULT_PREFIX+ SPLIT_PREFIX +"{%s}", name));
+            prefixes.add(String.format(DEFAULT_PREFIX+ SPLIT_PREFIX +"%s", name));
         }
         return prefixes;
     }
@@ -51,26 +51,26 @@ public static String buildImpressions() {
     }
 
     public static String buildSegment(String segmentName) {
-        return String.format(DEFAULT_PREFIX+SEGMENT+"{%s}", segmentName);
+        return String.format(DEFAULT_PREFIX+SEGMENT+"%s", segmentName);
     }
 
     public static String buildSegmentAll() {
         return String.format(DEFAULT_PREFIX+SEGMENT+"*");
     }
 
     public static String buildSegmentTill(String segmentName) {
-        return String.format(DEFAULT_PREFIX+SEGMENT+"{%s}."+TILL, segmentName);
+        return String.format(DEFAULT_PREFIX+SEGMENT+"%s."+TILL, segmentName);
     }
 
     public static String buildTelemetryLatenciesPrefix(String method, int bucketForLatency, String sdkVersion, String machineIp, String machineName) {
-        return String.format(DEFAULT_PREFIX+TELEMETRY+LATENCIES+"::{%s}/{%s}/{%s}/"+"{%s}/{%d}", sdkVersion, machineName, machineIp, method, bucketForLatency);
+        return String.format(DEFAULT_PREFIX+TELEMETRY+LATENCIES+"::%s/%s/%s/"+"%s/%d", sdkVersion, machineName, machineIp, method, bucketForLatency);
     }
 
     public static String buildTelemetryExceptionsPrefix(String method, String sdkVersion, String machineIp, String machineName) {
-        return String.format(DEFAULT_PREFIX+TELEMETRY+EXCEPTIONS+"::{%s}/{%s}/{%s}/"+"{%s}", sdkVersion, machineName, machineIp, method);
+        return String.format(DEFAULT_PREFIX+TELEMETRY+EXCEPTIONS+"::%s/%s/%s/"+"%s", sdkVersion, machineName, machineIp, method);
     }
 
     public static String buildTelemetryInit(String sdkVersion, String machineIp, String machineName) {
-        return String.format(DEFAULT_PREFIX+TELEMETRY+INIT+"::{%s}/{%s}/{%s}", sdkVersion, machineName, machineIp);
+        return String.format(DEFAULT_PREFIX+TELEMETRY+INIT+"::%s/%s/%s", sdkVersion, machineName, machineIp);
     }
 }

client/src/main/java/io/split/storages/pluggable/domain/SafeUserStorageWrapper.java

@@ -1,11 +1,10 @@
 package io.split.storages.pluggable.domain;
 
-import io.split.storages.pluggable.CustomStorageWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import pluggable.CustomStorageWrapper;
 
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkNotNull;

client/src/main/java/io/split/storages/pluggable/synchronizer/TelemetryConsumerSubmitter.java

@@ -5,11 +5,11 @@
 import io.split.client.utils.Json;
 import io.split.client.utils.SDKMetadata;
 import io.split.storages.enums.OperationMode;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.ConfigConsumer;
 import io.split.storages.pluggable.domain.PrefixAdapter;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
 import io.split.telemetry.synchronizer.TelemetrySynchronizer;
+import pluggable.CustomStorageWrapper;
 
 import java.util.List;
 import java.util.Map;

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

@@ -9,7 +9,6 @@
 import io.split.integrations.IntegrationsConfig;
 import io.split.storages.enums.OperationMode;
 import io.split.storages.enums.StorageMode;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.CustomStorageWrapperImp;
 import io.split.storages.pluggable.domain.EventConsumer;
 import io.split.storages.pluggable.domain.ImpressionConsumer;

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

@@ -3,14 +3,13 @@
 import io.split.client.impressions.ImpressionsManager;
 import io.split.integrations.IntegrationsConfig;
 import io.split.storages.enums.OperationMode;
-import io.split.storages.enums.StorageMode;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.storages.pluggable.domain.SafeUserStorageWrapper;
 import io.split.telemetry.storage.TelemetryStorage;
 import io.split.telemetry.synchronizer.TelemetrySynchronizer;
 import junit.framework.TestCase;
 import org.junit.Test;
 import org.mockito.Mockito;
+import pluggable.CustomStorageWrapper;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java

@@ -5,7 +5,6 @@
 import io.split.client.dtos.TestImpressions;
 
 import io.split.storages.enums.OperationMode;
-import io.split.storages.pluggable.CustomStorageWrapper;
 import io.split.telemetry.domain.enums.ImpressionsDataTypeEnum;
 import io.split.telemetry.storage.InMemoryTelemetryStorage;
 import io.split.telemetry.storage.TelemetryStorage;
@@ -18,6 +17,7 @@
 import org.mockito.Captor;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
+import pluggable.CustomStorageWrapper;
 
 import java.net.URISyntaxException;
 import java.util.AbstractMap;