This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 318448424 Reuse constants
318448424 is described below
commit 31844842416cf04d8fe3a0c4bf266778faec6842
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Feb 22 16:11:29 2026 -0500
Reuse constants
Format tweaks
---
.../org/apache/commons/lang3/time/DateUtils.java | 95 ++++++++++------------
1 file changed, 43 insertions(+), 52 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/time/DateUtils.java
b/src/main/java/org/apache/commons/lang3/time/DateUtils.java
index 09e0998c8..fef787c91 100644
--- a/src/main/java/org/apache/commons/lang3/time/DateUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DateUtils.java
@@ -1110,23 +1110,18 @@ private static Calendar modify(final Calendar val,
final int field, final Modify
if (val.get(Calendar.YEAR) > 280000000) {
throw new ArithmeticException("Calendar value too large for
accurate calculations");
}
-
if (field == Calendar.MILLISECOND) {
return val;
}
-
final long originalMillis = val.getTimeInMillis();
-
// Fix for LANG-59 START
// see https://issues.apache.org/jira/browse/LANG-59
//
// Manually truncate milliseconds, seconds and minutes, rather than
using
// Calendar methods.
-
final Date date = val.getTime();
long time = date.getTime();
boolean done = false;
-
// truncate milliseconds
final int millisecs = val.get(Calendar.MILLISECOND);
if (ModifyType.TRUNCATE == modType || millisecs < 500) {
@@ -1135,50 +1130,46 @@ private static Calendar modify(final Calendar val,
final int field, final Modify
if (field == Calendar.SECOND) {
done = true;
}
-
// truncate seconds
final int seconds = val.get(Calendar.SECOND);
if (!done && (ModifyType.TRUNCATE == modType || seconds < 30)) {
- time = time - seconds * 1000L;
+ time = time - seconds * MILLIS_PER_SECOND;
}
if (field == Calendar.MINUTE) {
done = true;
}
-
// truncate minutes
final int minutes = val.get(Calendar.MINUTE);
if (!done && (ModifyType.TRUNCATE == modType || minutes < 30)) {
- time = time - minutes * 60000L;
+ time = time - minutes * MILLIS_PER_MINUTE;
}
-
// reset time
if (date.getTime() != time) {
date.setTime(time);
val.setTime(date);
}
// Fix for LANG-59 END
-
boolean roundUp = false;
for (final int[] aField : fields) {
for (final int element : aField) {
if (element == field) {
- //This is our field... we stop looping
+ // This is our field... we stop looping
if (modType == ModifyType.CEILING && originalMillis !=
val.getTimeInMillis() || modType == ModifyType.ROUND && roundUp) {
if (field == SEMI_MONTH) {
- //This is a special case that's hard to generalize
- //If the date is 1, we round up to 16, otherwise
- // we subtract 15 days and add 1 month
+ // This is a special case that's hard to generalize
+ // If the date is 1, we round up to 16, otherwise
+ // we subtract 15 days and add 1 month
if (val.get(Calendar.DATE) == 1) {
val.add(Calendar.DATE, 15);
} else {
val.add(Calendar.DATE, -15);
val.add(Calendar.MONTH, 1);
}
- // Fix for LANG-440 START
+ // Fix for LANG-440 START
} else if (field == Calendar.AM_PM) {
// This is a special case
// If the time is 0, we round up to 12, otherwise
- // we subtract 12 hours and add 1 day
+ // we subtract 12 hours and add 1 day
if (val.get(Calendar.HOUR_OF_DAY) == 0) {
val.add(Calendar.HOUR_OF_DAY, 12);
} else {
@@ -1187,59 +1178,59 @@ private static Calendar modify(final Calendar val,
final int field, final Modify
}
// Fix for LANG-440 END
} else {
- //We need at add one to this field since the
- // last number causes us to round up
+ // We need at add one to this field since the
+ // last number causes us to round up
val.add(aField[0], 1);
}
}
return val;
}
}
- //We have various fields that are not easy roundings
+ // We have various fields that are not easy roundings
int offset = 0;
boolean offsetSet = false;
- //These are special types of fields that require different
rounding rules
+ // These are special types of fields that require different
rounding rules
switch (field) {
- case SEMI_MONTH:
- if (aField[0] == Calendar.DATE) {
- //If we're going to drop the DATE field's value,
- // we want to do this our own way.
- //We need to subtract 1 since the date has a minimum
of 1
- offset = val.get(Calendar.DATE) - 1;
- //If we're above 15 days adjustment, that means we're
in the
- // bottom half of the month and should stay
accordingly.
- if (offset >= 15) {
- offset -= 15;
- }
- //Record whether we're in the top or bottom half of
that range
- roundUp = offset > 7;
- offsetSet = true;
+ case SEMI_MONTH:
+ if (aField[0] == Calendar.DATE) {
+ // If we're going to drop the DATE field's value,
+ // we want to do this our own way.
+ // We need to subtract 1 since the date has a minimum of 1
+ offset = val.get(Calendar.DATE) - 1;
+ // If we're above 15 days adjustment, that means we're in
the
+ // bottom half of the month and should stay accordingly.
+ if (offset >= 15) {
+ offset -= 15;
}
- break;
- case Calendar.AM_PM:
- if (aField[0] == Calendar.HOUR_OF_DAY) {
- //If we're going to drop the HOUR field's value,
- // we want to do this our own way.
- offset = val.get(Calendar.HOUR_OF_DAY);
- if (offset >= 12) {
- offset -= 12;
- }
- roundUp = offset >= 6;
- offsetSet = true;
+ // Record whether we're in the top or bottom half of that
range
+ roundUp = offset > 7;
+ offsetSet = true;
+ }
+ break;
+ case Calendar.AM_PM:
+ if (aField[0] == Calendar.HOUR_OF_DAY) {
+ // If we're going to drop the HOUR field's value,
+ // we want to do this our own way.
+ offset = val.get(Calendar.HOUR_OF_DAY);
+ if (offset >= 12) {
+ offset -= 12;
}
- break;
- default:
- break;
+ roundUp = offset >= 6;
+ offsetSet = true;
+ }
+ break;
+ default:
+ break;
}
if (!offsetSet) {
final int min = val.getActualMinimum(aField[0]);
final int max = val.getActualMaximum(aField[0]);
- //Calculate the offset from the minimum allowed value
+ // Calculate the offset from the minimum allowed value
offset = val.get(aField[0]) - min;
- //Set roundUp if this is more than halfway between the minimum
and maximum
+ // Set roundUp if this is more than halfway between the
minimum and maximum
roundUp = offset > (max - min) / 2;
}
- //We need to remove this field
+ // We need to remove this field
if (offset != 0) {
val.set(aField[0], val.get(aField[0]) - offset);
}
