Tweaks

Author: itssimon

src/main/java/io/apitally/common/ConsumerRegistry.java

@@ -18,15 +18,18 @@ public ConsumerRegistry() {
         this.updated = new HashSet<>();
     }
 
-    public static Consumer consumerFromStringOrObject(Object consumer) {
+    public static Consumer consumerFromObject(Object consumer) {
         if (consumer == null) {
             return null;
         }
-        if (consumer instanceof String) {
+        if (consumer instanceof Consumer c) {
+            return c.getIdentifier().trim().isEmpty() ? null : c;
+        } else if (consumer instanceof String) {
             String identifier = (String) consumer;
             return identifier.trim().isEmpty() ? null : new Consumer(identifier);
-        } else if (consumer instanceof Consumer c) {
-            return c.getIdentifier().trim().isEmpty() ? null : c;
+        } else if (consumer instanceof Integer || consumer instanceof Long) {
+            String identifier = String.valueOf(consumer);
+            return new Consumer(identifier);
         }
         return null;
     }

src/main/java/io/apitally/spring/ApitallyFilter.java

@@ -19,7 +19,6 @@
 import io.apitally.common.dto.Header;
 import io.apitally.common.dto.Request;
 import io.apitally.common.dto.Response;
-
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -73,7 +72,7 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull Ht
             try {
                 // Register consumer and get consumer identifier
                 final Consumer consumer = ConsumerRegistry
-                        .consumerFromStringOrObject(request.getAttribute("apitallyConsumer"));
+                        .consumerFromObject(request.getAttribute("apitallyConsumer"));
                 client.consumerRegistry.addOrUpdateConsumer(consumer);
                 final String consumerIdentifier = consumer != null ? consumer.getIdentifier() : "";
 

src/test/java/io/apitally/common/ConsumerRegistryTest.java

@@ -1,6 +1,7 @@
 package io.apitally.common;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.List;
 
@@ -19,8 +20,7 @@ void setUp() {
 
     @Test
     void testAddOrUpdateConsumer() {
-        Consumer consumer;
-        consumer = ConsumerRegistry.consumerFromStringOrObject("test");
+        Consumer consumer = ConsumerRegistry.consumerFromObject("test");
         consumerRegistry.addOrUpdateConsumer(consumer);
         consumer = new Consumer("test", "Test 1", "Group 1");
         consumerRegistry.addOrUpdateConsumer(consumer);
@@ -40,4 +40,29 @@ void testAddOrUpdateConsumer() {
         consumers = consumerRegistry.getAndResetConsumers();
         assertEquals(0, consumers.size());
     }
+
+    @Test
+    void testconsumerFromObject() {
+        Consumer consumer = ConsumerRegistry.consumerFromObject("test");
+        assertEquals("test", consumer.getIdentifier());
+        assertNull(consumer.getName());
+        assertNull(consumer.getGroup());
+
+        consumer = ConsumerRegistry.consumerFromObject(new Consumer("test", "Test 1", "Group 1"));
+        assertEquals("test", consumer.getIdentifier());
+        assertEquals("Test 1", consumer.getName());
+        assertEquals("Group 1", consumer.getGroup());
+
+        consumer = ConsumerRegistry.consumerFromObject(123);
+        assertEquals("123", consumer.getIdentifier());
+
+        consumer = ConsumerRegistry.consumerFromObject(1.23);
+        assertNull(consumer);
+
+        consumer = ConsumerRegistry.consumerFromObject("");
+        assertNull(consumer);
+
+        consumer = ConsumerRegistry.consumerFromObject(null);
+        assertNull(consumer);
+    }
 }