Skip to content

Commit 321440e

Browse files
authored
Merge pull request #1572 from brendandburns/release-11-fix
Fix the build for JODA time
2 parents c6915b7 + 3f3d278 commit 321440e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventLogger.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private static class EventLog {
6868
private String resourceVersion;
6969
}
7070

71-
static V1Patch buildEventPatch(int count, String message, OffsetDateTime now) {
71+
static V1Patch buildEventPatch(int count, String message, DateTime now) {
7272
return new V1Patch(
7373
String.format(
7474
"{\"message\":\"%s\",\"count\":%d,\"lastTimestamp\":%s}",

extended/src/test/java/io/kubernetes/client/extended/event/legacy/EventLoggerTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
import static org.junit.Assert.*;
1616

1717
import io.kubernetes.client.custom.V1Patch;
18-
import java.time.OffsetDateTime;
1918
import org.junit.Test;
19+
import org.joda.time.DateTime;
2020

2121
public class EventLoggerTest {
2222

2323
@Test
2424
public void buildEventPatch() {
25-
String expectedStr = "2021-03-02T15:02:48.179000Z";
26-
OffsetDateTime expected = OffsetDateTime.parse("2021-03-02T15:02:48.179000Z");
25+
String expectedStr = "2021-03-02T15:02:48.179Z";
26+
DateTime expected = DateTime.parse("2021-03-02T15:02:48.179Z");
2727
V1Patch patch = EventLogger.buildEventPatch(1, "foo", expected);
2828
assertEquals(
2929
"{\"message\":\"foo\",\"count\":1,\"lastTimestamp\":\"" + expectedStr + "\"}",

0 commit comments

Comments
 (0)