SNAPSHOT XContent serialization done

Author: lukewhiting

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/CronnableSchedule.java

@@ -18,9 +18,10 @@ public abstract class CronnableSchedule implements Schedule {
     private static final Comparator<Cron> CRON_COMPARATOR = Comparator.comparing(Cron::expression);
 
     protected final Cron[] crons;
+    private TimeZone timeZone;
 
-    CronnableSchedule(TimeZone timeZone, String... expressions) {
-        this(crons(timeZone, expressions));
+    CronnableSchedule(String... expressions) {
+        this(crons(expressions));
     }
 
     private CronnableSchedule(Cron... crons) {
@@ -30,11 +31,16 @@ private CronnableSchedule(Cron... crons) {
     }
 
     protected void setTimeZone(TimeZone timeZone) {
+        this.timeZone = timeZone;
         for (Cron cron : crons) {
             cron.setTimeZone(timeZone);
         }
     }
 
+    public TimeZone getTimeZone() {
+        return timeZone;
+    }
+
     @Override
     public long nextScheduledTimeAfter(long startTime, long time) {
         assert time >= startTime;
@@ -69,10 +75,10 @@ public boolean equals(Object obj) {
         return Objects.deepEquals(this.crons, other.crons);
     }
 
-    static Cron[] crons(TimeZone timeZone, String... expressions) {
+    static Cron[] crons(String... expressions) {
         Cron[] crons = new Cron[expressions.length];
         for (int i = 0; i < crons.length; i++) {
-            crons[i] = new Cron(expressions[i], timeZone);
+            crons[i] = new Cron(expressions[i]);
         }
         return crons;
     }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistry.java

@@ -39,7 +39,7 @@ public Schedule parse(String context, XContentParser parser) throws IOException
         TimeZone timeZone = TimeZone.getTimeZone(ZoneOffset.UTC); // Default to UTC
         while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
             if (token == XContentParser.Token.FIELD_NAME) {
-                if (parser.currentName().equals("timezone")) {
+                if (parser.currentName().equals(ScheduleTrigger.TIMEZONE_FIELD)) {
                     if (schedule != null && schedule instanceof CronnableSchedule == false) {
                         throw new ElasticsearchParseException(
                             "could not parse schedule. timezone is not supported for [{}] schedule type",

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleTrigger.java

@@ -14,6 +14,7 @@
 public class ScheduleTrigger implements Trigger {
 
     public static final String TYPE = "schedule";
+    public static final String TIMEZONE_FIELD = "timezone";
 
     private final Schedule schedule;
 
@@ -49,7 +50,13 @@ public int hashCode() {
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        return builder.startObject().field(schedule.type(), schedule, params).endObject();
+        builder.startObject();
+        if (schedule instanceof CronnableSchedule cronnableSchedule && cronnableSchedule.getTimeZone() != null) {
+            builder.field(TIMEZONE_FIELD, cronnableSchedule.getTimeZone().getID());
+        }
+
+        builder.field(schedule.type(), schedule, params);
+        return builder.endObject();
     }
 
     public static Builder builder(Schedule schedule) {