chore: update timestamp and support string/map metadata

Author: alexbabrykovich

sdk/src/main/java/com/hcaptcha/sdk/HCaptchaVerifyParams.java

@@ -43,6 +43,6 @@ public class HCaptchaVerifyParams implements Serializable {
      * Optional user journey events to be passed to hCaptcha.
      * Contains user interaction events for analytics.
      */
-    @JsonProperty("user_journey")
+    @JsonProperty("userjourney")
     private Object userJourney;
 }

sdk/src/main/java/com/hcaptcha/sdk/journeylitics/ConsoleSink.java

@@ -1,6 +1,7 @@
 package com.hcaptcha.sdk.journeylitics;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -32,7 +33,7 @@ public class JLConfig {
     }
 
     JLConfig() {
-        this(true, true, true, true, true, true, true, Arrays.asList(ConsoleSink.INSTANCE));
+        this(true, true, true, true, true, true, true, Collections.emptyList());
     }
 
     /**

sdk/src/main/java/com/hcaptcha/sdk/journeylitics/JLConfig.java

@@ -3,31 +3,35 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 public class JLEvent {
-    private final long timestampMs;
+    private final long timestamp;
     private final EventKind kind;
     private final String view;
-    private final Map<String, Object> metadata;
+    private final Object metadata;
 
-    JLEvent(long timestampMs, EventKind kind, String view, Map<String, Object> metadata) {
-        this.timestampMs = timestampMs;
+    JLEvent(long timestamp, EventKind kind, String view, Object metadata) {
+        this.timestamp = timestamp;
         this.kind = kind;
         this.view = view;
         this.metadata = metadata;
     }
 
     JLEvent(EventKind kind, String view, Map<String, Object> metadata) {
-        this(System.currentTimeMillis(), kind, view, metadata);
+        this(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()), kind, view, metadata);
     }
 
     JLEvent(EventKind kind, String view) {
         this(kind, view, new java.util.HashMap<>());
     }
 
+    /**
+     * UNIX timestamp (seconds).
+     */
     @JsonProperty("ts")
-    long getTimestampMs() {
-        return timestampMs;
+    long getTimestamp() {
+        return timestamp;
     }
 
     @JsonProperty("k")
@@ -41,7 +45,7 @@ String getView() {
     }
 
     @JsonProperty("m")
-    Map<String, Object> getMetadata() {
+    Object getMetadata() {
         return metadata;
     }
 }

sdk/src/main/java/com/hcaptcha/sdk/journeylitics/JLEvent.java

@@ -1,5 +1,7 @@
 package com.hcaptcha.sdk.journeylitics;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -28,5 +30,23 @@ public void emit(JLEvent event) {
         sink.emit(new JLEvent(EventKind.click, "Button", new HashMap<>(meta)));
         Assert.assertTrue(captured.size() == before + 1);
     }
+
+    @Test
+    public void metadata_serializes_as_string() throws Exception {
+        final ObjectMapper mapper = new ObjectMapper();
+        final JLEvent event = new JLEvent(1234567890L, EventKind.click, "Button", "meta-string");
+        final JsonNode node = mapper.readTree(mapper.writeValueAsString(event));
+        Assert.assertEquals("meta-string", node.get("m").asText());
+    }
+
+    @Test
+    public void metadata_serializes_as_object() throws Exception {
+        final ObjectMapper mapper = new ObjectMapper();
+        final Map<String, Object> meta = new HashMap<>();
+        meta.put("id", "submit-btn");
+        final JLEvent event = new JLEvent(1234567890L, EventKind.click, "Button", meta);
+        final JsonNode node = mapper.readTree(mapper.writeValueAsString(event));
+        Assert.assertEquals("submit-btn", node.get("m").get("id").asText());
+    }
 }