remove v1 related conditional check code (#1930)

* update hardcoded version check

* remove get function since all v2/v3 endpoints use post

* get rid of dead if branch check v2 and post function

* get rid of apiversion for send function

* get rid of apiversion for sendTokenRefresh

* get rid of all apiVersion

* update readabilty

* spacing

* indentation

* reformat

Author: lizk886

src/main/java/com/uid2/operator/monitoring/StatsCollectorVerticle.java

@@ -89,16 +89,14 @@ public void handleMessage(Message message) {
         }
 
         String path = messageItem.getPath();
-        String apiVersion = "v0";
-        String endpoint = path.substring(1);
+        String apiVersion = "unknown";
+        String endpoint = path.startsWith("/") ? path.substring(1) : path;
 
-        if(path.length() > 1 && path.charAt(1) == 'v') {
+        if (path.length() > 1 && path.charAt(1) == 'v') {
             int apiVIndex = path.indexOf("/", 1);
             if (apiVIndex > 1) {
                 apiVersion = path.substring(1, apiVIndex);
                 endpoint = path.substring(apiVIndex + 1);
-            } else {
-                apiVersion = "unknown";
             }
         }
 

src/test/java/com/uid2/operator/EUIDOperatorVerticleTest.java

@@ -40,7 +40,7 @@ void badRequestOnInvalidTcfConsent(Vertx vertx, VertxTestContext testContext) {
         final JsonObject v2Payload = new JsonObject();
         v2Payload.put("email", emailAddress);
         v2Payload.put("tcf_consent_string", "invalid_consent_string");
-        sendTokenGenerate("v2", vertx, "", v2Payload, 400, json -> testContext.completeNow());
+        sendTokenGenerate(vertx, v2Payload, 400, json -> testContext.completeNow());
     }
 
     @Test
@@ -53,7 +53,7 @@ void noTCFString(Vertx vertx, VertxTestContext testContext) {
         final String emailAddress = "test@uid2.com";
         final JsonObject v2Payload = new JsonObject();
         v2Payload.put("email", emailAddress);
-        sendTokenGenerate("v2", vertx, "", v2Payload, 200, json -> testContext.completeNow(), false);
+        sendTokenGenerate(vertx,  v2Payload, 200, json -> testContext.completeNow(), false);
 
     }
 
@@ -69,7 +69,7 @@ void noContentOnInsufficientTcfConsent(Vertx vertx, VertxTestContext testContext
         v2Payload.put("email", emailAddress);
         // this TCString is missing consent for purpose #1
         v2Payload.put("tcf_consent_string", "CPehXK9PehXK9ABAMBFRACBoADAAAEJAAIYgAKwAQAKgArABAAqAAA");
-        sendTokenGenerate("v2", vertx, "", v2Payload, 200, json -> {
+        sendTokenGenerate(vertx, v2Payload, 200, json -> {
             assertFalse(json.containsKey("body"));
             assertEquals("insufficient_user_consent", json.getString("status"));
             testContext.completeNow();

src/test/java/com/uid2/operator/StatsCollectorVerticleTest.java

@@ -73,28 +73,6 @@ private void triggerSerializeAndWait(VertxTestContext testContext) throws JsonPr
         testContext.awaitCompletion(LOG_WAIT_INTERVAL, TimeUnit.MILLISECONDS);
     }
 
-    @Test
-    void testJSONSerializeWithV0AndV1Paths(Vertx vertx, VertxTestContext testContext) throws InterruptedException, JsonProcessingException {
-        StatsCollectorMessageItem messageItem = new StatsCollectorMessageItem("/test", "https://test.com", "test", 1, CLIENT_VERSION);
-        sendStatMessage(messageItem);
-        sendStatMessage(messageItem);
-        sendStatMessage(messageItem);
-
-        messageItem = new StatsCollectorMessageItem("/v1/test", "https://test.com", "test", 1, CLIENT_VERSION);
-        sendStatMessage(messageItem);
-        sendStatMessage(messageItem);
-        waitForLogInterval(testContext);
-
-        triggerSerializeAndWait(testContext);
-
-        var expectedList = List.of("{\"endpoint\":\"test\",\"siteId\":1,\"apiVersion\":\"v1\",\"domainList\":[{\"domain\":\"test.com\",\"count\":2,\"apiContact\":\"test\"}]}",
-                            "{\"endpoint\":\"test\",\"siteId\":1,\"apiVersion\":\"v0\",\"domainList\":[{\"domain\":\"test.com\",\"count\":3,\"apiContact\":\"test\"}]}");
-        var messages = getMessages();
-        assertThat(messages).containsAll(expectedList);
-
-        testContext.completeNow();
-    }
-
     private static void waitForLogInterval(VertxTestContext testContext) throws InterruptedException {
         testContext.awaitCompletion(JSON_INTERVAL*2, TimeUnit.MILLISECONDS);
     }
@@ -134,7 +112,7 @@ void allValidPathsAllowed(Vertx vertx, VertxTestContext testContext) throws Inte
         var messages = getMessages();
         for(String endpoint: validEndpoints) {
             String withoutVersion = endpoint;
-            if (endpoint.startsWith("/v1/") || endpoint.startsWith("/v2/") || endpoint.startsWith("/v3/")) {
+            if (endpoint.startsWith("/v2/") || endpoint.startsWith("/v3/")) {
                 withoutVersion = endpoint.substring(4);
             } else if (endpoint.startsWith("/")) {
                 withoutVersion = endpoint.substring(1);
@@ -160,11 +138,11 @@ void invalidPathsLimit(Vertx vertx, VertxTestContext testContext) throws Interru
         var messages = getMessages();
         // MAX_INVALID_PATHS is not the hard limit. The maximum paths that can be recorded, including valid ones, is MAX_INVALID_PATHS + validPaths.size * 2
         for(int i = 0; i < MAX_INVALID_PATHS + Endpoints.pathSet().size(); i++) {
-            String expected = "{\"endpoint\":\"bad" + i + "\",\"siteId\":1,\"apiVersion\":\"v0\",\"domainList\":[{\"domain\":\"test.com\",\"count\":1,\"apiContact\":\"test\"}]}";
+            String expected = "{\"endpoint\":\"bad" + i + "\",\"siteId\":1,\"apiVersion\":\"unknown\",\"domainList\":[{\"domain\":\"test.com\",\"count\":1,\"apiContact\":\"test\"}]}";
             assertThat(messages).contains(expected);
         }
         for(int i = MAX_INVALID_PATHS + Endpoints.pathSet().size(); i < MAX_INVALID_PATHS + 5; i++) {
-            String expected = "{\"endpoint\":\"bad" + i + "\",\"siteId\":1,\"apiVersion\":\"v0\",\"domainList\":[{\"domain\":\"test.com\",\"count\":1,\"apiContact\":\"test\"}]}";
+            String expected = "{\"endpoint\":\"bad" + i + "\",\"siteId\":1,\"apiVersion\":\"unknown\",\"domainList\":[{\"domain\":\"test.com\",\"count\":1,\"apiContact\":\"test\"}]}";
             assertThat(messages).contains(expected);
         }
         assertThat(getMessages()).contains("max invalid paths reached; a large number of invalid paths have been requested from authenticated participants");