Final commit, editing name and adding some key words

Author: ldecheverz-split

…client/FactoryInstantiationsService.java …client/FactoryInstantiationsCounter.javaclient/src/main/java/io/split/client/FactoryInstantiationsService.java renamed to client/src/main/java/io/split/client/FactoryInstantiationsCounter.java client/src/main/java/io/split/client/FactoryInstantiationsService.java renamed to client/src/main/java/io/split/client/FactoryInstantiationsCounter.java

@@ -1,29 +1,30 @@
 package io.split.client;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ConcurrentHashMultiset;
 import com.google.common.collect.Multiset;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class FactoryInstantiationsService {
+public class FactoryInstantiationsCounter {
 
-    private static final Logger _log = LoggerFactory.getLogger(FactoryInstantiationsService.class);
-    private static volatile FactoryInstantiationsService _factoryInstantiationsService;
+    private static final Logger _log = LoggerFactory.getLogger(FactoryInstantiationsCounter.class);
+    private static volatile FactoryInstantiationsCounter _factoryInstantiationsCounter;
     private static final Multiset<String> USED_API_TOKENS = ConcurrentHashMultiset.create();
 
 
-    private FactoryInstantiationsService() {}
+    private FactoryInstantiationsCounter() {}
 
-    public static FactoryInstantiationsService getFactoryInstantiationsServiceInstance() {
-        if(_factoryInstantiationsService == null) {
-            synchronized (FactoryInstantiationsService.class) {
-                if (_factoryInstantiationsService == null) {
-                    _factoryInstantiationsService = new FactoryInstantiationsService();
+    public static FactoryInstantiationsCounter getFactoryInstantiationsServiceInstance() {
+        if(_factoryInstantiationsCounter == null) {
+            synchronized (FactoryInstantiationsCounter.class) {
+                if (_factoryInstantiationsCounter == null) {
+                    _factoryInstantiationsCounter = new FactoryInstantiationsCounter();
                 }
             }
         }
 
-        return _factoryInstantiationsService;
+        return _factoryInstantiationsCounter;
     }
 
     public void addToken(String apiToken) {
@@ -52,7 +53,18 @@ public void removeToken(String apiToken) {
      * @param apiToken
      * @return
      */
-    public boolean isTokenPresent(String apiToken){
+    @VisibleForTesting
+    boolean isTokenPresent(String apiToken) {
         return USED_API_TOKENS.contains(apiToken);
     }
+
+    /**
+     * Just for test
+     * @param apiToken
+     * @return
+     */
+    @VisibleForTesting
+    int getCount(String apiToken) {
+        return USED_API_TOKENS.count(apiToken);
+    }
 }

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

@@ -1,7 +1,5 @@
 package io.split.client;
 
-import com.google.common.collect.ConcurrentHashMultiset;
-import com.google.common.collect.Multiset;
 import io.split.client.impressions.AsynchronousImpressionListener;
 import io.split.client.impressions.ImpressionListener;
 import io.split.client.impressions.ImpressionsManagerImpl;
@@ -62,19 +60,19 @@ public class SplitFactoryImpl implements SplitFactory {
     private final static long SSE_CONNECT_TIMEOUT = 30000;
     private final static long SSE_SOCKET_TIMEOUT = 70000;
 
-    private static final Multiset<String> USED_API_TOKENS = ConcurrentHashMultiset.create();
     private static Random RANDOM = new Random();
 
     private final SplitClient _client;
     private final SplitManager _manager;
     private final Runnable destroyer;
     private final String _apiToken;
     private boolean isTerminated = false;
+    private final FactoryInstantiationsCounter _factoryInstantiationsCounter;
 
     public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyntaxException {
         _apiToken = apiToken;
-
-        FactoryInstantiationsService.getFactoryInstantiationsServiceInstance().addToken(apiToken);
+        _factoryInstantiationsCounter = FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance();
+        _factoryInstantiationsCounter.addToken(apiToken);
 
         if (config.blockUntilReady() == -1) {
             //BlockUntilReady not been set
@@ -202,7 +200,8 @@ public void destroy() {
         synchronized (SplitFactoryImpl.class) {
             if (!isTerminated) {
                 destroyer.run();
-                FactoryInstantiationsService.getFactoryInstantiationsServiceInstance().removeToken(_apiToken);
+                _factoryInstantiationsCounter.removeToken(_apiToken);
+                int i = FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().getCount(_apiToken);
                 isTerminated = true;
             }
         }

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

@@ -0,0 +1,50 @@
+package io.split.client;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+public class FactoryInstantiationsCounterTest extends TestCase {
+
+    private static final String FIRST_TOKEN = "TOKENNUMBER1";
+    private static final String SECOND_TOKEN = "TOKENNUMBER2";
+
+    @Test
+    public void testAddingNewToken() {
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().addToken(FIRST_TOKEN);
+        assertTrue(FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().isTokenPresent(FIRST_TOKEN));
+
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().removeToken(FIRST_TOKEN);
+    }
+
+    @Test
+    public void testAddingExistingToken() {
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().addToken(FIRST_TOKEN);
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().addToken(FIRST_TOKEN);
+
+        assertTrue(FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().isTokenPresent(FIRST_TOKEN));
+        assertEquals(2, FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().getCount(FIRST_TOKEN));
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().removeToken(FIRST_TOKEN);
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().removeToken(FIRST_TOKEN);
+    }
+
+    @Test
+    public void testRemovingToken() {
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().addToken(FIRST_TOKEN);
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().removeToken(FIRST_TOKEN);
+
+        assertFalse(FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().isTokenPresent(FIRST_TOKEN));
+        assertEquals(0, FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().getCount(FIRST_TOKEN));
+    }
+
+    @Test
+    public void testAddingNonExistingToken() {
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().addToken(FIRST_TOKEN);
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().addToken(SECOND_TOKEN);
+
+        assertTrue(FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().isTokenPresent(FIRST_TOKEN));
+        assertEquals(1, FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().getCount(FIRST_TOKEN));
+        assertEquals(1, FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().getCount(SECOND_TOKEN));
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().removeToken(FIRST_TOKEN);
+        FactoryInstantiationsCounter.getFactoryInstantiationsServiceInstance().removeToken(SECOND_TOKEN);
+    }
+}