Merge pull request #218 from kbase/sdkdev

Remove joda time from test deps

Author: MrCreosote

build.gradle

@@ -340,7 +340,6 @@ dependencies {
 		exclude group: 'com.fasterxml.jackson.core'  // don't upgrade yet, breaks tests
 		exclude group: 'net.java.dev.jna' // don't include in runtime path
 	}
-	testImplementation('joda-time:joda-time:2.2')
 	// needed for syslog4j. Used in java test modules and JsonServerServlet subclasses in tests
 	// but not in SDK code proper.
 	testImplementation('net.java.dev.jna:jna:3.4.0')

src/test/java/us/kbase/test/sdk/callback/CallbackServerTest.java

@@ -16,7 +16,6 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -25,12 +24,14 @@
 import java.util.Map;
 import java.util.UUID;
 
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+
 import org.apache.commons.io.FileUtils;
 import org.ini4j.InvalidFileFormatException;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.DateTimeFormatterBuilder;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -82,13 +83,15 @@ public static ModuleVersionInfo getMVI(ModuleInfo mi, String release) {
 
     private final static DateTimeFormatter DATE_PARSER =
             new DateTimeFormatterBuilder()
-                .append(DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss"))
-                .appendOptional(DateTimeFormat.forPattern(".SSS").getParser())
-                .append(DateTimeFormat.forPattern("Z"))
+                .appendPattern("yyyy-MM-dd'T'HH:mm:ss")
+                .optionalStart()
+                .appendPattern(".SSS")
+                .optionalEnd()
+                .appendPattern("XXX")
                 .toFormatter();
-    
+
     private final static DateTimeFormatter DATE_FORMATTER =
-            DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ssZ").withZoneUTC();
+            DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX").withZone(ZoneOffset.UTC);
 
     @BeforeAll
     public static void beforeClass() throws Exception {
@@ -573,7 +576,7 @@ public void setProvenance() throws Exception {
                 .withMethod("amethod")
                 .withService("aservice")
                 .withServiceVer("0.0.2-dev")
-                .withTime(DATE_FORMATTER.print(new DateTime()))
+                .withTime(DATE_FORMATTER.format(Instant.now()))
                 .withMethodParams(Arrays.asList(new UObject(param1), new UObject(param2)))
                 .withInputWsObjects(wsobjs);
 
@@ -740,8 +743,8 @@ private void checkProvenance(
         assertThat("number of provenance actions",
                 prov.size(), is(1));
         ProvenanceAction pa = prov.get(0);
-        long got = DATE_PARSER.parseDateTime(pa.getTime()).getMillis();
-        long now = new Date().getTime();
+        long got = OffsetDateTime.parse(pa.getTime(), DATE_PARSER).toInstant().toEpochMilli();
+        long now = Instant.now().toEpochMilli();
         assertTrue(got < now, "got prov time < now ");
         assertTrue(got > now - (5 * 60 * 1000), "got prov time > now - 5m");
         assertThat("correct service", pa.getService(), is(moduleName));