Skip to content

Revert "Fix subsecond formatting: treat missing subsecond as zero and… #4916

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

Open
aziemchawdhary-gs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "Fix subsecond formatting: treat missing subsecond as zero and… #4916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 36 additions & 27 deletions ...dencies/src/main/java/org/finos/legend/engine/plan/dependencies/domain/date/PureDate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,11 @@ else if (!timeZone.equals(calendar.getTimeZone()))
// Hour (1-12)
case 'h':
{
int preDisplayHour = hasHour() ? ((calendar == null) ? this.hour : calendar.get(Calendar.HOUR_OF_DAY)) : 0;
if (!hasHour())
{
throw new IllegalArgumentException("Date has no hour: " + this);
}
int preDisplayHour = (calendar == null) ? this.hour : calendar.get(Calendar.HOUR_OF_DAY);
int displayHour = (preDisplayHour == 0) ? 12 : ((preDisplayHour > 12) ? (preDisplayHour - 12) : preDisplayHour);
int count = getCharCountFrom(character, formatString, i);
appendZeroPaddedInt(appendable, displayHour, count + 1);
Expand All @@ -268,7 +272,11 @@ else if (!timeZone.equals(calendar.getTimeZone()))
// Hour (0-23)
case 'H':
{
int displayHour = hasHour() ? ((calendar == null) ? this.hour : calendar.get(Calendar.HOUR_OF_DAY)) : 0;
if (!hasHour())
{
throw new IllegalArgumentException("Date has no hour: " + this);
}
int displayHour = (calendar == null) ? this.hour : calendar.get(Calendar.HOUR_OF_DAY);
int count = getCharCountFrom(character, formatString, i);
appendZeroPaddedInt(appendable, displayHour, count + 1);
i += count;
Expand All @@ -277,14 +285,22 @@ else if (!timeZone.equals(calendar.getTimeZone()))
// AM/PM
case 'a':
{
int displayHour = hasHour() ? ((calendar == null) ? this.hour : calendar.get(Calendar.HOUR_OF_DAY)) : 0;
if (!hasHour())
{
throw new IllegalArgumentException("Date has no hour: " + this);
}
int displayHour = (calendar == null) ? this.hour : calendar.get(Calendar.HOUR_OF_DAY);
appendable.append((displayHour < 12) ? "AM" : "PM");
break;
}
// Minute
case 'm':
{
int displayMinute = hasMinute() ? ((calendar == null) ? this.minute : calendar.get(Calendar.MINUTE)) : 0;
if (!hasMinute())
{
throw new IllegalArgumentException("Date has no minute: " + this);
}
int displayMinute = (calendar == null) ? this.minute : calendar.get(Calendar.MINUTE);
int count = getCharCountFrom(character, formatString, i);
appendZeroPaddedInt(appendable, displayMinute, count + 1);
i += count;
Expand All @@ -293,42 +309,35 @@ else if (!timeZone.equals(calendar.getTimeZone()))
// Second
case 's':
{
int displaySecond = hasSecond() ? this.second : 0;
if (!hasSecond())
{
throw new IllegalArgumentException("Date has no second: " + this);
}
int count = getCharCountFrom(character, formatString, i);
appendZeroPaddedInt(appendable, displaySecond, count + 1);
appendZeroPaddedInt(appendable, this.second, count + 1);
i += count;
break;
}
// Subsecond
case 'S':
{
int count = getCharCountFrom(character, formatString, i);
int maxLen = count + 1;
if (!hasSubsecond())
{
for (int j = 0; j < maxLen; j++)
{
appendable.append('0');
}
throw new IllegalArgumentException("Date has no sub-second: " + this);
}
int count = getCharCountFrom(character, formatString, i);
int maxLen = count + 1;
int len = this.subsecond.length();
if (len <= maxLen)
{
appendable.append(this.subsecond);
}
else
{
int len = this.subsecond.length();
if (len <= maxLen)
int j = 0;
while (j < maxLen)
{
appendable.append(this.subsecond);
for (int j = len; j < maxLen; j++)
{
appendable.append('0');
}
}
else
{
int j = 0;
while (j < maxLen)
{
appendable.append(this.subsecond.charAt(j++));
}
appendable.append(this.subsecond.charAt(j++));
}
}
i += count;
Expand Down
Loading
Loading