Merge pull request #2875 from wiremock/renderable-date-to-json

RafeArnold · web-flow · commit 6986b2727417 · 2024-10-21T11:56:30.000+02:00
write RenderableDate to JSON correctly.
diff --git a/src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/RenderableDate.java b/src/main/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/RenderableDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Thomas Akehurst
+ * Copyright (C) 2018-2024 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.databind.util.ISO8601Utils;
 import java.text.SimpleDateFormat;
 import java.time.ZoneId;
@@ -42,6 +43,7 @@ public ZoneId getTimezone() {
   }
 
   @Override
+  @JsonValue
   public String toString() {
     if (format != null) {
       if (format.equals("epoch")) {
diff --git a/src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/RenderableDateTest.java b/src/test/java/com/github/tomakehurst/wiremock/extension/responsetemplating/helpers/RenderableDateTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 Thomas Akehurst
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.tomakehurst.wiremock.extension.responsetemplating.helpers;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import com.github.tomakehurst.wiremock.common.Json;
+import java.util.Date;
+import org.junit.jupiter.api.Test;
+
+public class RenderableDateTest {
+
+  @Test
+  void writesToJsonInStringFormat() {
+    RenderableDate renderableDate = new RenderableDate(new Date(1729266504000L), null, null);
+    assertThat(Json.write(renderableDate), is("\"2024-10-18T15:48:24Z\""));
+  }
+}
