fix: better error message if tz invalid in datetime string (#3449)

confluentinc · Oct 2, 2019 · e93c445 · e93c445
1 parent c600858
commit e93c445
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/...common/src/main/java/io/confluent/ksql/util/timestamp/PartialStringToTimestampParser.java b/...common/src/main/java/io/confluent/ksql/util/timestamp/PartialStringToTimestampParser.java
@@ -30,7 +30,8 @@ public class PartialStringToTimestampParser {
 
   private static final String HELP_MESSAGE = System.lineSeparator()
       + "Required format is: \"" + KsqlConstants.DATE_TIME_PATTERN + "\", "
-      + "with an optional numeric timezone. "
+      + "with an optional numeric 4-digit timezone, for example: "
+      + "'2020-05-26T23.59.58.000' or with tz: '2020-05-26T23.59.58.000+0200'. "
       + "Partials are also supported, for example \"2020-05-26\"";
 
   private static final StringToTimestampParser PARSER =
@@ -57,11 +58,8 @@ public long parse(final String text) {
     }
 
     try {
-      if (timezone.length() > 0) {
-        return PARSER.parse(date + "T" + time, ZoneId.of(timezone));
-      } else {
-        return PARSER.parse(date + "T" + time);
-      }
+      final ZoneId zoneId = parseTimezone(timezone);
+      return PARSER.parse(date + "T" + time, zoneId);
     } catch (final RuntimeException e) {
       throw new KsqlException("Failed to parse timestamp '" + text
           + "': " + e.getMessage()
@@ -83,6 +81,21 @@ private static String getTimezone(final String time) {
     return "";
   }
 
+  private static ZoneId parseTimezone(final String timezone) {
+    if (timezone.trim().isEmpty()) {
+      return ZoneId.systemDefault();
+    }
+
+    try {
+      return ZoneId.of(timezone);
+    } catch (final Exception e) {
+      throw new KsqlException("Failed to parse timezone '" + timezone
+          + "': " + e.getMessage(),
+          e
+      );
+    }
+  }
+
   private static String completeDate(final String date) {
     final String[] parts = date.split("-");
     if (parts.length == 1) {

diff --git a/...on/src/test/java/io/confluent/ksql/util/timestamp/PartialStringToTimestampParserTest.java b/...on/src/test/java/io/confluent/ksql/util/timestamp/PartialStringToTimestampParserTest.java
@@ -117,7 +117,7 @@ public void shouldThrowOnTimezoneParseError() {
   public void shouldIncludeRequiredFormatInErrorMessage() {
     // Expect:
     expectedException.expectMessage("Required format is: \"yyyy-MM-dd'T'HH:mm:ss.SSS\", "
-        + "with an optional numeric timezone. Partials are also supported, for example \"2020-05-26\"");
+        + "with an optional numeric 4-digit timezone");
 
     // When:
     parser.parse("2017-01-01T00:00:00.000+foo");