Merge pull request #11 from Runabout-LLC/dev

v2.1.0

Author: ethanbond64

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.0 - 2024-06-12
+### Changed
+- Updated the RunaboutService to use java.time.Instant#toString for the datetime field instead of java.sql.Timestamp.
+
 ## 2.0.0 - 2024-06-07
 ### Added
 - RunaboutAPI interface and builder for saving runabout Scenarios to the Runabout ingest API asynchronously.

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'dev.runabout'
-version = '2.0.0'
+version = '2.1.0'
 
 repositories {
     mavenCentral()

src/main/java/dev/runabout/RunaboutScenario.java

@@ -2,7 +2,6 @@
 
 import dev.runabout.annotations.Nullable;
 
-import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Supplier;
@@ -16,11 +15,11 @@ public final class RunaboutScenario {
     private final String method;
     private final String eventId;
     private final String project;
-    private final Timestamp datetime;
+    private final String datetime;
     private final JsonObject properties;
     private final Collection<RunaboutInstance> instances;
 
-    public RunaboutScenario(String method, String eventId, @Nullable String project, Timestamp datetime,
+    public RunaboutScenario(String method, String eventId, @Nullable String project, String datetime,
                             @Nullable JsonObject properties, Collection<RunaboutInstance> instances) {
         this.method = method;
         this.eventId = eventId;
@@ -42,7 +41,7 @@ public String getProject() {
         return project;
     }
 
-    public Timestamp getDatetime() {
+    public String getDatetime() {
         return datetime;
     }
 
@@ -66,7 +65,7 @@ public JsonObject toJsonObject(final Supplier<JsonObject> jsonFactory) {
                 .put(RunaboutConstants.VERSION_KEY, RunaboutConstants.JSON_CONTRACT_VERSION)
                 .put(RunaboutConstants.EVENT_ID_KEY, eventId)
                 .put(RunaboutConstants.PROJECT_KEY, project)
-                .put(RunaboutConstants.DATETIME_KEY, datetime.toString())
+                .put(RunaboutConstants.DATETIME_KEY, datetime)
                 .put(RunaboutConstants.PROPERTIES_KEY, properties)
                 .put(RunaboutConstants.METHOD_KEY, method)
                 .put(RunaboutConstants.INSTANCES_KEY, JsonObject.class, jsonInstances);

src/main/java/dev/runabout/RunaboutServiceImpl.java

@@ -10,7 +10,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -71,7 +70,7 @@ public RunaboutInput serialize(Object object) {
     @Override
     public RunaboutScenario createScenario(final String eventId, final JsonObject properties, final Object... objects) {
 
-        final Timestamp datetime = getDatetime();
+        final String datetime = Instant.now().toString();
         final String method = methodResolver.getSerializedMethod();
 
         final List<RunaboutInstance> instances = new ArrayList<>();
@@ -252,8 +251,4 @@ private static String getAnonymousImplClass(final Class<?> clazz) {
                 .map(Class::getCanonicalName)
                 .orElse("null");
     }
-
-    private static Timestamp getDatetime() {
-        return Timestamp.from(Instant.now());
-    }
 }

src/test/java/dev/runabout/RunaboutApiTests.java

@@ -10,7 +10,6 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.URI;
-import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
@@ -31,7 +30,6 @@ void basicScenarioTest() {
         final AtomicBoolean failed = new AtomicBoolean(false);
         withLocalServer(
             (headers, s) -> {
-                System.out.println("headers: " + headers);
                 token.set(headers.get("Authorization").get(0).replace("Bearer ", ""));
                 body.set(Document.parse(s));
                 return 200;
@@ -43,7 +41,7 @@ void basicScenarioTest() {
                         .setListener(error -> failed.set(true))
                         .build();
                 final RunaboutScenario scenario = new RunaboutScenario("method", "event00", "dev",
-                        Timestamp.from(Instant.now()), new JsonObjectImpl().put("key", "value"), List.of(
+                        Instant.now().toString(), new JsonObjectImpl().put("key", "value"), List.of(
                         new RunaboutInstance("type", "eval", Set.of("dep1", "dep2"))));
                 api.ingestScenario(scenario);
                 Awaitility.await().atMost(Duration.ofSeconds(10))
@@ -65,7 +63,7 @@ void testFailedRequest() {
                     .setListener(error -> failed.set(true))
                     .build();
             final RunaboutScenario scenario = new RunaboutScenario("method", "event00", "dev",
-                    Timestamp.from(Instant.now()), new JsonObjectImpl().put("key", "value"), List.of(
+                    Instant.now().toString(), new JsonObjectImpl().put("key", "value"), List.of(
                     new RunaboutInstance("type", "eval", Set.of("dep1", "dep2"))));
             api.ingestScenario(scenario);
             Awaitility.await().atMost(Duration.ofSeconds(10))

src/test/java/dev/runabout/fixtures/Logger.java

@@ -24,7 +24,6 @@ public Logger(OutputStream outputStream) {
     }
 
     public void runaboutInfo(final Object... objects) {
-//        runaboutService.sendScenario(event, properties, objects);
         info(() -> runaboutService.createScenario(null, null, objects).toJsonObject().toJson());
     }