fix(analytics): fix analytics types based on api spec changes

Author: Fanis

src/main/java/org/typesense/api/AnalyticsRuleSerializer.java

@@ -6,6 +6,7 @@
 import org.typesense.model.AnalyticsRule;
 import org.typesense.model.AnalyticsRuleCreate;
 import org.typesense.model.AnalyticsRuleCreateParams;
+import org.typesense.model.AnalyticsRuleType;
 import java.util.List;
 import java.util.ArrayList;
 
@@ -34,14 +35,9 @@ public AnalyticsRule parseFromJsonNode(JsonNode node) {
 
         if (node.has("type")) {
             String typeStr = node.get("type").asText();
-            if ("counter".equals(typeStr)) {
-                rule.type(AnalyticsRuleCreate.TypeEnum.COUNTER);
-            } else if ("popular_queries".equals(typeStr)) {
-                rule.type(AnalyticsRuleCreate.TypeEnum.POPULAR_QUERIES);
-            } else if ("nohits_queries".equals(typeStr)) {
-                rule.type(AnalyticsRuleCreate.TypeEnum.NOHITS_QUERIES);
-            } else if ("log".equals(typeStr)) {
-                rule.type(AnalyticsRuleCreate.TypeEnum.LOG);
+            AnalyticsRuleType type = AnalyticsRuleType.fromValue(typeStr);
+            if (type != null) {
+                rule.type(type);
             }
         }
 

src/test/java/org/typesense/api/AnalyticsRulesTest.java

@@ -7,6 +7,7 @@
 import org.typesense.model.AnalyticsRule;
 import org.typesense.model.AnalyticsRuleCreate;
 import org.typesense.model.AnalyticsRuleCreateParams;
+import org.typesense.model.AnalyticsRuleType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -77,7 +78,7 @@ void testCreate() throws Exception {
 
         AnalyticsRuleCreate analyticsRule = new AnalyticsRuleCreate()
                 .name(ruleName)
-                .type(AnalyticsRuleCreate.TypeEnum.COUNTER)
+                .type(AnalyticsRuleType.COUNTER)
                 .collection("analytics_data")
                 .eventType("click")
                 .params(new AnalyticsRuleCreateParams()
@@ -95,7 +96,7 @@ void testCreate() throws Exception {
         AnalyticsRule createdRule = result.getFirstRule();
         assertNotNull(createdRule);
         assertEquals(ruleName, createdRule.getName());
-        assertEquals(AnalyticsRuleCreate.TypeEnum.COUNTER, createdRule.getType());
+        assertEquals(AnalyticsRuleType.COUNTER, createdRule.getType());
         assertEquals("analytics_data", createdRule.getCollection());
         assertEquals("click", createdRule.getEventType());
     }
@@ -107,7 +108,7 @@ void testRetrieve() throws Exception {
 
         AnalyticsRuleCreate analyticsRule = new AnalyticsRuleCreate()
                 .name(ruleName)
-                .type(AnalyticsRuleCreate.TypeEnum.COUNTER)
+                .type(AnalyticsRuleType.COUNTER)
                 .collection("analytics_data")
                 .eventType("click")
                 .params(new AnalyticsRuleCreateParams()
@@ -133,7 +134,7 @@ void testRetrieve() throws Exception {
 
         assertNotNull(foundRule, "rule not found");
         assertEquals(ruleName, foundRule.getName());
-        assertEquals(AnalyticsRuleCreate.TypeEnum.COUNTER, foundRule.getType());
+        assertEquals(AnalyticsRuleType.COUNTER, foundRule.getType());
         assertEquals("analytics_data", foundRule.getCollection());
         assertEquals("click", foundRule.getEventType());
     }
@@ -145,7 +146,7 @@ void testRetrieveSingle() throws Exception {
 
         AnalyticsRuleCreate analyticsRule = new AnalyticsRuleCreate()
                 .name(ruleName)
-                .type(AnalyticsRuleCreate.TypeEnum.COUNTER)
+                .type(AnalyticsRuleType.COUNTER)
                 .collection("analytics_data")
                 .eventType("click")
                 .params(new AnalyticsRuleCreateParams()
@@ -160,7 +161,7 @@ void testRetrieveSingle() throws Exception {
         AnalyticsRule result = this.client.analytics().rules(ruleName).retrieve();
         assertNotNull(result);
         assertEquals(ruleName, result.getName());
-        assertEquals(AnalyticsRuleCreate.TypeEnum.COUNTER, result.getType());
+        assertEquals(AnalyticsRuleType.COUNTER, result.getType());
         assertEquals("analytics_data", result.getCollection());
         assertEquals("click", result.getEventType());
     }
@@ -172,7 +173,7 @@ void testDelete() throws Exception {
 
         AnalyticsRuleCreate analyticsRule = new AnalyticsRuleCreate()
                 .name(ruleName)
-                .type(AnalyticsRuleCreate.TypeEnum.COUNTER)
+                .type(AnalyticsRuleType.COUNTER)
                 .collection("analytics_data")
                 .eventType("click")
                 .params(new AnalyticsRuleCreateParams()

src/test/java/org/typesense/api/Helper.java

@@ -33,6 +33,7 @@
 import org.typesense.model.AnalyticsRuleCreate;
 import org.typesense.model.AnalyticsRuleCreateParams;
 import org.typesense.model.AnalyticsRule;
+import org.typesense.model.AnalyticsRuleType;
 import org.typesense.api.AnalyticsRules;
 
 public class Helper {
@@ -170,7 +171,7 @@ public String createTestAnalyticsRule() throws Exception {
 
         AnalyticsRuleCreate analyticsRule = new AnalyticsRuleCreate()
                 .name(ruleName)
-                .type(AnalyticsRuleCreate.TypeEnum.COUNTER)
+                .type(AnalyticsRuleType.COUNTER)
                 .collection("analytics_data")
                 .eventType("click")
                 .params(new AnalyticsRuleCreateParams()