SNAPSHOT Test fixup

Author: lukewhiting

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

@@ -12,15 +12,11 @@
 import java.io.IOException;
 import java.time.DateTimeException;
 import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.TimeZone;
 
-import static java.util.Optional.ofNullable;
-
 public class ScheduleRegistry {
     private final Map<String, Schedule.Parser<? extends Schedule>> parsers = new HashMap<>();
 
@@ -36,19 +32,13 @@ public Schedule parse(String context, XContentParser parser) throws IOException
         String type = null;
         XContentParser.Token token;
         Schedule schedule = null;
-        TimeZone timeZone = TimeZone.getTimeZone(ZoneOffset.UTC); // Default to UTC
+        TimeZone timeZone = null; // Default to UTC
         while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
             if (token == XContentParser.Token.FIELD_NAME) {
-                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",
-                            schedule.type()
-                        );
-                    }
-                    timeZone = parseTimezone(parser).orElse(null);
+                var fieldName = parser.currentName();
+                if (fieldName.equals(ScheduleTrigger.TIMEZONE_FIELD)) {
+                    timeZone = parseTimezone(parser);
                 } else {
-                    parser.nextToken();
                     type = parser.currentName();
                 }
             } else if (type != null) {
@@ -66,12 +56,17 @@ public Schedule parse(String context, XContentParser parser) throws IOException
 
         if (timeZone != null && schedule instanceof CronnableSchedule cronnableSchedule) {
             cronnableSchedule.setTimeZone(timeZone);
+        } else if (timeZone != null) {
+            throw new ElasticsearchParseException(
+                "could not parse schedule. Timezone is not supported for schedule type [{}]",
+                schedule.type()
+            );
         }
 
         return schedule;
     }
 
-    private static Optional<TimeZone> parseTimezone(XContentParser parser) throws IOException {
+    private static TimeZone parseTimezone(XContentParser parser) throws IOException {
         TimeZone timeZone;
         XContentParser.Token token = parser.nextToken();
         if (token == XContentParser.Token.VALUE_STRING) {
@@ -87,7 +82,7 @@ private static Optional<TimeZone> parseTimezone(XContentParser parser) throws IO
                 token
             );
         }
-        return ofNullable(timeZone);
+        return timeZone;
     }
 
     public Schedule parse(String context, String type, XContentParser parser) throws IOException {

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/schedule/ScheduleRegistryTests.java

@@ -14,6 +14,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.TimeZone;
 
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.equalTo;
@@ -50,14 +51,21 @@ public void testParserInterval() throws Exception {
 
     public void testParseCron() throws Exception {
         Object cron = randomBoolean() ? Schedules.cron("* 0/5 * * * ?") : Schedules.cron("* 0/2 * * * ?", "* 0/3 * * * ?", "* 0/5 * * * ?");
-        XContentBuilder builder = jsonBuilder().startObject().field(CronSchedule.TYPE, cron).endObject();
+        TimeZone timeZone = null;
+        XContentBuilder builder = jsonBuilder().startObject().field(CronSchedule.TYPE, cron);
+        if (randomBoolean()) {
+            timeZone = randomTimeZone();
+            builder.field(ScheduleTrigger.TIMEZONE_FIELD, timeZone.getID());
+        }
+        builder.endObject();
         BytesReference bytes = BytesReference.bytes(builder);
         XContentParser parser = createParser(JsonXContent.jsonXContent, bytes);
         parser.nextToken();
-        Schedule schedule = registry.parse("ctx", parser);
+        CronnableSchedule schedule = (CronnableSchedule) registry.parse("ctx", parser);
         assertThat(schedule, notNullValue());
         assertThat(schedule, instanceOf(CronSchedule.class));
         assertThat(schedule, is(cron));
+        assertThat(schedule.getTimeZone(), equalTo(timeZone));
     }
 
     public void testParseHourly() throws Exception {