From f8eaab6713e1e5b2e25d85b82fde3d2eb5f6ff1b Mon Sep 17 00:00:00 2001
From: Erik Schultink <eschultink@users.noreply.github.com>
Date: Wed, 22 May 2024 12:05:04 -0700
Subject: [PATCH] remove joda

---
 java/pom.xml                                         |  5 -----
 .../appengine/tools/mapreduce/impl/InProcessMap.java | 12 ++----------
 .../tools/mapreduce/impl/InProcessMapReduce.java     | 10 ++--------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 8cced0fb..1ecb77a2 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -183,11 +183,6 @@
       <artifactId>guava</artifactId>
       <version>[32.1,32.99]</version>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>[2.3,2.10.99)</version>
-    </dependency>
     <dependency>
       <groupId>it.unimi.dsi</groupId>
       <artifactId>fastutil</artifactId>
diff --git a/java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMap.java b/java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMap.java
index 699b59bd..923bc524 100644
--- a/java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMap.java
+++ b/java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMap.java
@@ -20,12 +20,9 @@
 import com.google.common.collect.ImmutableList;
 
 import lombok.SneakyThrows;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 
 import java.io.IOException;
-import java.io.Serializable;
+import java.time.Instant;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
@@ -96,7 +93,6 @@ public void completed(Iterator<WorkerShardTask<I, O, MapOnlyMapperContext<O>>> t
     return new MapReduceResultImpl<>(output.finish(writers), counters);
   }
 
-
   @SneakyThrows
   @SuppressWarnings("unchecked")
   private MapOnlyMapper<I, O> getCopyOfMapper() {
@@ -104,12 +100,8 @@ private MapOnlyMapper<I, O> getCopyOfMapper() {
     return SerializationUtil.deserialize(bytes);
   }
 
-  private static final DateTimeFormatter DATE_FORMAT =
-      DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss");
-
   private static String getMapReduceId() {
-    DateTime dt = new DateTime();
-    return "in-process-map-" + DATE_FORMAT.print(dt) + "-" + new Random().nextInt(1000000);
+    return "in-process-map-" + Instant.now().toString() + "-" + new Random().nextInt(1000000);
   }
 
   public static <I, O, R> MapReduceResult<R> runMap(MapSpecification<I, O, R> mrSpec)
diff --git a/java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMapReduce.java b/java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMapReduce.java
index 7d589166..f8332ac2 100644
--- a/java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMapReduce.java
+++ b/java/src/main/java/com/google/appengine/tools/mapreduce/impl/InProcessMapReduce.java
@@ -25,11 +25,9 @@
 import com.google.common.collect.ImmutableList;
 
 import lombok.SneakyThrows;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -221,12 +219,8 @@ public void completed(
     return new MapReduceResultImpl<>(output.finish(outputs), counters);
   }
 
-  private static final DateTimeFormatter DATE_FORMAT =
-      DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss");
-
   private static String getMapReduceId() {
-    DateTime dt = new DateTime();
-    return "in-process-mr-" + DATE_FORMAT.print(dt) + "-" + new Random().nextInt(1000000);
+    return "in-process-mr-" + Instant.now().toString() + "-" + new Random().nextInt(1000000);
   }
 
   public static <I, K, V, O, R> MapReduceResult<R> runMapReduce(