From 3f3d2787cb95b1b4ec61fc248907839a59a8ea22 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 2 Mar 2021 14:36:19 -0800 Subject: [PATCH] Fix the build for JODA time --- .../client/extended/event/legacy/EventLogger.java | 2 +- .../client/extended/event/legacy/EventLoggerTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java index 959ad7d95b..0b8faa1688 100644 --- a/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java +++ b/extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java @@ -68,7 +68,7 @@ private static class EventLog { private String resourceVersion; } - static V1Patch buildEventPatch(int count, String message, OffsetDateTime now) { + static V1Patch buildEventPatch(int count, String message, DateTime now) { return new V1Patch( String.format( "{\"message\":\"%s\",\"count\":%d,\"lastTimestamp\":%s}", diff --git a/extended/src/test/java/io/kubernetes/client/extended/event/legacy/EventLoggerTest.java b/extended/src/test/java/io/kubernetes/client/extended/event/legacy/EventLoggerTest.java index 89838add50..9ee083f52d 100644 --- a/extended/src/test/java/io/kubernetes/client/extended/event/legacy/EventLoggerTest.java +++ b/extended/src/test/java/io/kubernetes/client/extended/event/legacy/EventLoggerTest.java @@ -15,15 +15,15 @@ import static org.junit.Assert.*; import io.kubernetes.client.custom.V1Patch; -import java.time.OffsetDateTime; import org.junit.Test; +import org.joda.time.DateTime; public class EventLoggerTest { @Test public void buildEventPatch() { - String expectedStr = "2021-03-02T15:02:48.179000Z"; - OffsetDateTime expected = OffsetDateTime.parse("2021-03-02T15:02:48.179000Z"); + String expectedStr = "2021-03-02T15:02:48.179Z"; + DateTime expected = DateTime.parse("2021-03-02T15:02:48.179Z"); V1Patch patch = EventLogger.buildEventPatch(1, "foo", expected); assertEquals( "{\"message\":\"foo\",\"count\":1,\"lastTimestamp\":\"" + expectedStr + "\"}",