try fixing joda time problem by using ObjectMapper's that have the jo…

…da time module enabled
thelastpickle · Mar 20, 2024 · dbb81a4 · dbb81a4
1 parent b0405ba
commit dbb81a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/server/src/main/java/io/cassandrareaper/management/ClusterFacade.java b/src/server/src/main/java/io/cassandrareaper/management/ClusterFacade.java
@@ -36,6 +36,7 @@
 import io.cassandrareaper.service.RingRange;
 import io.cassandrareaper.storage.IDistributedStorage;
 import io.cassandrareaper.storage.OpType;
+import io.dropwizard.jackson.Jackson;
 
 import java.io.IOError;
 import java.io.IOException;
@@ -180,8 +181,9 @@ public static CompactionStats parseCompactionStats(String json) throws IOExcepti
 
   private static <T> T parseJson(String json, TypeReference<T> ref) throws IOException {
     try {
-      ObjectMapper mapper = new ObjectMapper();
-      mapper.registerModule(new Jdk8Module());
+      // ObjectMapper mapper = new ObjectMapper();
+      // mapper.registerModule(new Jdk8Module());
+      ObjectMapper mapper = Jackson.newObjectMapper();
       return mapper.readValue(json, ref);
     } catch (IOException e) {
       LOG.error("Error parsing json", e);

diff --git a/src/server/src/test/java/io/cassandrareaper/SimpleReaperClient.java b/src/server/src/test/java/io/cassandrareaper/SimpleReaperClient.java
@@ -46,6 +46,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
 import com.google.common.collect.Maps;
 
 import org.slf4j.Logger;
@@ -127,7 +128,7 @@ public static Response doHttpCall(
 
   private static <T> T parseJSON(String json, TypeReference<T> ref) {
     try {
-      return new ObjectMapper().readValue(json, ref);
+      return new ObjectMapper().registerModule(new JodaModule()).readValue(json, ref);
     } catch (IOException e) {
       LOG.error("error parsing json", e);
       throw new RuntimeException(e);