Merge pull request #77 from Flagsmith/release/5.0.3

Release 5.0.3

Author: matthewelwell

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.flagsmith</groupId>
   <artifactId>flagsmith-java-client</artifactId>
-  <version>5.0.2</version>
+  <version>5.0.3</version>
   <packaging>jar</packaging>
 
   <name>Flagsmith Java Client</name>

src/main/java/com/flagsmith/models/Flags.java

@@ -183,7 +183,7 @@ public BaseFlag getFlag(String featureName) throws FlagsmithClientError {
     if (analyticsProcessor != null && flag instanceof Flag) {
       Flag flagObj = (Flag) flag;
       if (flagObj.getFeatureId() != null) {
-        analyticsProcessor.trackFeature(flagObj.getFeatureId());
+        analyticsProcessor.trackFeature(flagObj.getFeatureName());
       }
     }
 

src/main/java/com/flagsmith/threads/AnalyticsProcessor.java

@@ -21,7 +21,7 @@ public class AnalyticsProcessor {
 
   private final String analyticsEndpoint = "analytics/flags/";
   private Integer analyticsTimer = 10;
-  private Map<Integer, Integer> analyticsData;
+  private Map<String, Integer> analyticsData;
   @ToString.Exclude private FlagsmithSdk api;
   private Long nextFlush;
   private RequestProcessor requestProcessor;
@@ -63,7 +63,7 @@ public AnalyticsProcessor(FlagsmithSdk api, OkHttpClient client, FlagsmithLogger
    */
   public AnalyticsProcessor(
       FlagsmithSdk api, FlagsmithLogger logger, RequestProcessor requestProcessor) {
-    this.analyticsData = new HashMap<Integer, Integer>();
+    this.analyticsData = new HashMap<String, Integer>();
     this.requestProcessor = requestProcessor;
     this.logger = logger;
     this.nextFlush = Instant.now().getEpochSecond() + analyticsTimer;
@@ -134,10 +134,10 @@ public void flush() {
 
   /**
    * Track the feature usage for analytics.
-   * @param featureId feature id
+   * @param featureName name of the feature to track evaluation for
    */
-  public void trackFeature(Integer featureId) {
-    analyticsData.put(featureId, analyticsData.getOrDefault(featureId, 0) + 1);
+  public void trackFeature(String featureName) {
+    analyticsData.put(featureName, analyticsData.getOrDefault(featureName, 0) + 1);
     if (nextFlush.compareTo(Instant.now().getEpochSecond()) < 0) {
       this.flush();
     }

src/test/java/com/flagsmith/threads/AnalyticsProcessorTest.java

@@ -20,7 +20,7 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-@Test(groups="unit")
+
 public class AnalyticsProcessorTest {
 
   private FlagsmithApiWrapper api;
@@ -48,31 +48,39 @@ public void init() {
     analytics = new AnalyticsProcessor(api, flagsmithLogger, requestProcessor);
   }
 
+  @Test(groups = "unit")
   public void AnalyticsProcessor_checkAnalyticsData() {
-    analytics.trackFeature(1);
-    Assert.assertTrue(analytics.getAnalyticsData().containsKey(1));
+    String featureName = "foo";
+
+    analytics.trackFeature(featureName);
+    Assert.assertTrue(analytics.getAnalyticsData().containsKey(featureName));
     Assert.assertEquals(analytics.getAnalyticsData().size(), 1);
 
-    analytics.trackFeature(1);
+    analytics.trackFeature(featureName);
     Assert.assertEquals(analytics.getAnalyticsData().size(), 1);
-    Assert.assertEquals(analytics.getAnalyticsData().get(1).intValue(), 2);
+    Assert.assertEquals(analytics.getAnalyticsData().get(featureName).intValue(), 2);
   }
 
+  @Test(groups = "unit")
   public void AnalyticsProcessor_checkAnalyticsDataCheckFlushRuns() throws InterruptedException {
+    String featureName = "foo";
     Long nextFlush = analytics.getNextFlush();
-    analytics.trackFeature(1);
+    analytics.trackFeature(featureName);
     Assert.assertEquals(nextFlush, analytics.getNextFlush());
     Thread.sleep(11000);
-    analytics.trackFeature(1);
+    analytics.trackFeature(featureName);
     Assert.assertEquals(analytics.getAnalyticsData().size(), 0);
     Assert.assertNotEquals(nextFlush, analytics.getNextFlush());
     verify(api, times(1)).newPostRequest(any(), any());
     verify(requestProcessor, times(1)).executeAsync(any(), any());
   }
 
+  @Test(groups = "unit")
   public void AnalyticsProcessor_checkAnalyticsRequestCheckFlushRuns() {
+    String featureName = "foo";
+
     Long nextFlush = analytics.getNextFlush();
-    analytics.trackFeature(1);
+    analytics.trackFeature(featureName);
     Assert.assertEquals(nextFlush, analytics.getNextFlush());
 
     analytics.flush();