Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ISO Support for Time Grains #1739

Closed
wants to merge 11 commits into from
Closed

ISO Support for Time Grains #1739

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1ecbbb4
iso support
Dec 28, 2020
89da649
format
Dec 28, 2020
7ee3969
timeformat interface
Jan 4, 2021
dfa4dd8
update ISO formatting
Jan 4, 2021
5529c7b
support ISO
Jan 12, 2021
3412eb1
testcases
Jan 13, 2021
d2c7d90
update testcase
Jan 14, 2021
348fea2
minute test
Jan 14, 2021
abeae82
formt
Jan 14, 2021
cc3ccc1
Merge branch 'master' into iso-date-format
AvaniMakwana Jan 14, 2021
ae3658f
review comment
Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...tore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/timegrains/Day.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public class Day extends Date {
public static final String FORMAT = "yyyy-MM-dd";
private static final SimpleDateFormat FORMATTER = new SimpleDateFormat(FORMAT);

public static final String ISO_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
private static final SimpleDateFormat ISO_FORMATTER = new SimpleDateFormat(ISO_FORMAT);

public Day(java.util.Date date) {
super(date.getTime());
}
Expand All @@ -34,10 +37,13 @@ public Day deserialize(Object val) {

try {
if (val instanceof String) {
date = new Day(new Timestamp(FORMATTER.parse((String) val).getTime()));
} else {
date = new Day(FORMATTER.parse(FORMATTER.format(val)));
try {
date = new Day(new Timestamp(FORMATTER.parse((String) val).getTime()));
} catch (ParseException pe) {
date = new Day(new Timestamp(ISO_FORMATTER.parse((String) val).getTime()));
}
}
date = new Day(FORMATTER.parse(FORMATTER.format(val)));
moizarafat marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we still need the else case? Otherwise this line stomps on line 36.

} catch (ParseException e) {
throw new IllegalArgumentException("String must be formatted as " + FORMAT);
}
Expand Down