This is an automated email from the ASF dual-hosted git repository.
golja pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1e5b95f154 Remove unnecessary Calendar casts
1e5b95f154 is described below
commit 1e5b95f154c93f341efaa8aafd2087908d30d6df
Author: Anahita Goljahani <[email protected]>
AuthorDate: Tue Oct 27 11:14:03 2026 +0100
Remove unnecessary Calendar casts
Calendar casts that cause warnings during the build have been removed.
---
.../org/apache/ofbiz/base/util/TimeDuration.java | 10 ++--
.../apache/ofbiz/base/util/TimeDurationTests.java | 8 ++--
.../ofbiz/service/calendar/RecurrenceInfo.java | 4 +-
.../service/calendar/TemporalExpressions.java | 54 +++++++++++-----------
4 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
index 069c1eef78..78f6e2892f 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/TimeDuration.java
@@ -74,12 +74,12 @@ public class TimeDuration implements Serializable,
Comparable<TimeDuration> {
int factor;
if (cal1.before(cal2)) {
factor = 1;
- calStart = (Calendar) cal1.clone();
- calEnd = (Calendar) cal2.clone();
+ calStart = cal1.clone();
+ calEnd = cal2.clone();
} else {
factor = -1;
- calStart = (Calendar) cal2.clone();
- calEnd = (Calendar) cal1.clone();
+ calStart = cal2.clone();
+ calEnd = cal1.clone();
}
/* Strategy: Using millisecond arithmetic alone will produce
inaccurate results.
@@ -163,7 +163,7 @@ public class TimeDuration implements Serializable,
Comparable<TimeDuration> {
//
// To solve this problem, we make a temporary copy of the
// start calendar, and only modify it if we actually have to.
- Calendar tmp = (Calendar) start.clone();
+ Calendar tmp = start.clone();
int tmpUnits = units;
tmp.add(type, tmpUnits);
while (tmp.after(end)) {
diff --git
a/framework/base/src/test/java/org/apache/ofbiz/base/util/TimeDurationTests.java
b/framework/base/src/test/java/org/apache/ofbiz/base/util/TimeDurationTests.java
index 68cf575ec5..a0fa64b0e6 100644
---
a/framework/base/src/test/java/org/apache/ofbiz/base/util/TimeDurationTests.java
+++
b/framework/base/src/test/java/org/apache/ofbiz/base/util/TimeDurationTests.java
@@ -124,7 +124,7 @@ public class TimeDurationTests {
TimeDuration.parseDuration(durationString), isNegative, false);
assertDurationFields(label + "(parseString)", d, durationString,
stringDuration, isNegative, false);
assertDurationFields(label + "(cal)", d, durationString, calDuration,
isNegative, false);
- Calendar added = calDuration.addToCalendar((Calendar) ZERO.clone());
+ Calendar added = calDuration.addToCalendar(ZERO.clone());
TimeDuration addDuration = new TimeDuration(ZERO, added);
assertDurationFields(label + "(cal[add])", d, durationString,
addDuration, isNegative, false);
assertEquals(0, doCompare(stringDuration, calDuration), label +
".compareTo(string, cal)");
@@ -143,7 +143,7 @@ public class TimeDurationTests {
public static void assertDuration(String label, DateTuple d) {
TimeDuration lastString = null;
- Calendar right = (Calendar) ZERO.clone();
+ Calendar right = ZERO.clone();
for (int i = 1; i < 12; i++) {
DateTuple nd = DateTuple.of(i * d.years, i * d.months, i * d.days,
i * d.hours, i * d.minutes, i * d.seconds, i *
d.milliseconds);
@@ -162,7 +162,7 @@ public class TimeDurationTests {
Calendar now = Calendar.getInstance();
TimeDuration zeroDuration = TimeDuration.ZERO_TIME_DURATION;
assertFalse(zeroDuration.equals(null), "zero equals null");
- Calendar newTime = (Calendar) now.clone();
+ Calendar newTime = now.clone();
zeroDuration.addToCalendar(newTime);
assertEquals(now, newTime, "zero same calendar");
assertDurationFields("zero(same zero calendar)", DateTuple.of(0, 0, 0,
0, 0, 0, 0), "0:0:0:0:0:0:0",
@@ -186,7 +186,7 @@ public class TimeDurationTests {
assertDuration("year", DateTuple.of(1, 0, 0, 0, 0, 0, 0));
Calendar start = new com.ibm.icu.util.GregorianCalendar(1967, 1, 1, 0,
0, 0);
start.set(Calendar.MILLISECOND, 0);
- Calendar end = (Calendar) start.clone();
+ Calendar end = start.clone();
end.add(Calendar.MILLISECOND, 1);
end.add(Calendar.SECOND, 1);
end.add(Calendar.MINUTE, 1);
diff --git
a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
index 8fa86947fb..d64102c6d1 100644
---
a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
+++
b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java
@@ -363,7 +363,7 @@ public class RecurrenceInfo {
if (result == 0) {
return null;
}
- Calendar first = (Calendar) cal.clone();
+ Calendar first = cal.clone();
first.setTimeInMillis(result);
return first;
}
@@ -377,7 +377,7 @@ public class RecurrenceInfo {
if (result == 0) {
return null;
}
- Calendar next = (Calendar) cal.clone();
+ Calendar next = cal.clone();
next.setTimeInMillis(result);
return next;
}
diff --git
a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java
b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java
index 8658c4d406..5d0e6dbfc9 100644
---
a/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java
+++
b/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java
@@ -221,7 +221,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar first(Calendar cal) {
int month = cal.get(Calendar.MONTH);
- Calendar first = alignDayOfWeek((Calendar) cal.clone());
+ Calendar first = alignDayOfWeek(cal.clone());
if (first.before(cal)) {
first.set(Calendar.DAY_OF_MONTH, 1);
if (first.get(Calendar.MONTH) == month) {
@@ -253,14 +253,14 @@ public class TemporalExpressions implements Serializable {
}
int month = cal.get(Calendar.MONTH);
int dom = cal.get(Calendar.DAY_OF_MONTH);
- Calendar next = (Calendar) cal.clone();
+ Calendar next = cal.clone();
alignDayOfWeek(next);
return dom == next.get(Calendar.DAY_OF_MONTH) &&
next.get(Calendar.MONTH) == month;
}
@Override
public boolean isSubstitutionCandidate(Calendar cal,
TemporalExpression expressionToTest) {
- Calendar checkCal = (Calendar) cal.clone();
+ Calendar checkCal = cal.clone();
checkCal.add(Calendar.DAY_OF_MONTH, -1);
while (!includesDate(checkCal)) {
if (expressionToTest.includesDate(checkCal)) {
@@ -274,7 +274,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar next(Calendar cal, ExpressionContext context) {
int month = cal.get(Calendar.MONTH);
- Calendar next = alignDayOfWeek((Calendar) cal.clone());
+ Calendar next = alignDayOfWeek(cal.clone());
if (next.before(cal) || next.equals(cal)) {
next.set(Calendar.DAY_OF_MONTH, 1);
if (next.get(Calendar.MONTH) == month) {
@@ -352,7 +352,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar first(Calendar cal) {
- Calendar first = (Calendar) cal.clone();
+ Calendar first = cal.clone();
while (!includesDate(first)) {
first.add(Calendar.DAY_OF_MONTH, 1);
}
@@ -381,7 +381,7 @@ public class TemporalExpressions implements Serializable {
@Override
public boolean isSubstitutionCandidate(Calendar cal,
TemporalExpression expressionToTest) {
- Calendar checkCal = (Calendar) cal.clone();
+ Calendar checkCal = cal.clone();
checkCal.add(Calendar.DAY_OF_MONTH, -1);
while (!includesDate(checkCal)) {
if (expressionToTest.includesDate(checkCal)) {
@@ -394,7 +394,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar next(Calendar cal, ExpressionContext context) {
- Calendar next = (Calendar) cal.clone();
+ Calendar next = cal.clone();
next.add(Calendar.DAY_OF_MONTH, 1);
while (!includesDate(next)) {
next.add(Calendar.DAY_OF_MONTH, 1);
@@ -471,7 +471,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar first(Calendar cal) {
- Calendar first = (Calendar) cal.clone();
+ Calendar first = cal.clone();
while (!includesDate(first)) {
first.add(Calendar.DAY_OF_MONTH, 1);
}
@@ -498,7 +498,7 @@ public class TemporalExpressions implements Serializable {
if (dow == this.start || dow == this.end) {
return true;
}
- Calendar compareCal = (Calendar) cal.clone();
+ Calendar compareCal = cal.clone();
while (compareCal.get(Calendar.DAY_OF_WEEK) != this.start) {
compareCal.add(Calendar.DAY_OF_MONTH, 1);
}
@@ -513,7 +513,7 @@ public class TemporalExpressions implements Serializable {
@Override
public boolean isSubstitutionCandidate(Calendar cal,
TemporalExpression expressionToTest) {
- Calendar checkCal = (Calendar) cal.clone();
+ Calendar checkCal = cal.clone();
checkCal.add(Calendar.DAY_OF_MONTH, -1);
while (!includesDate(checkCal)) {
if (expressionToTest.includesDate(checkCal)) {
@@ -526,7 +526,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar next(Calendar cal, ExpressionContext context) {
- Calendar next = (Calendar) cal.clone();
+ Calendar next = cal.clone();
if (includesDate(next)) {
if (context.isDayBumped()) {
context.setDayBumped(false);
@@ -758,7 +758,7 @@ public class TemporalExpressions implements Serializable {
@Override
public boolean isSubstitutionCandidate(Calendar cal,
TemporalExpression expressionToTest) {
- Calendar checkCal = (Calendar) cal.clone();
+ Calendar checkCal = cal.clone();
checkCal.add(this.freqType, -this.freqCount);
while (!includesDate(checkCal)) {
if (expressionToTest.includesDate(checkCal)) {
@@ -786,7 +786,7 @@ public class TemporalExpressions implements Serializable {
protected Calendar prepareCal(Calendar cal) {
// Performs a "sane" skip forward in time - avoids time consuming
loops
// like incrementing every second from Jan 1 2000 until today
- Calendar skip = (Calendar) cal.clone();
+ Calendar skip = cal.clone();
skip.setTime(this.start);
long deltaMillis = cal.getTimeInMillis() - this.start.getTime();
if (deltaMillis < 1000) {
@@ -884,7 +884,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar first(Calendar cal) {
- Calendar first = (Calendar) cal.clone();
+ Calendar first = cal.clone();
while (!includesDate(first)) {
first.add(Calendar.HOUR_OF_DAY, 1);
}
@@ -930,7 +930,7 @@ public class TemporalExpressions implements Serializable {
if (hour == this.start || hour == this.end) {
return true;
}
- Calendar compareCal = (Calendar) cal.clone();
+ Calendar compareCal = cal.clone();
compareCal.set(Calendar.HOUR_OF_DAY, this.start);
while (compareCal.get(Calendar.HOUR_OF_DAY) != this.end) {
if (compareCal.get(Calendar.HOUR_OF_DAY) == hour) {
@@ -943,7 +943,7 @@ public class TemporalExpressions implements Serializable {
@Override
public boolean isSubstitutionCandidate(Calendar cal,
TemporalExpression expressionToTest) {
- Calendar checkCal = (Calendar) cal.clone();
+ Calendar checkCal = cal.clone();
checkCal.add(Calendar.HOUR_OF_DAY, -1);
while (!includesDate(checkCal)) {
if (expressionToTest.includesDate(checkCal)) {
@@ -956,7 +956,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar next(Calendar cal, ExpressionContext context) {
- Calendar next = (Calendar) cal.clone();
+ Calendar next = cal.clone();
if (includesDate(next)) {
if (context.isHourBumped()) {
return next;
@@ -1051,7 +1051,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar first(Calendar cal) {
- Calendar first = (Calendar) cal.clone();
+ Calendar first = cal.clone();
for (TemporalExpression expression : this.expressionSet) {
first = expression.first(first);
if (first == null) {
@@ -1094,7 +1094,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar next(Calendar cal, ExpressionContext context) {
- Calendar next = (Calendar) cal.clone();
+ Calendar next = cal.clone();
for (TemporalExpression expression : this.expressionSet) {
next = expression.next(next, context);
if (next == null) {
@@ -1174,7 +1174,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar first(Calendar cal) {
- Calendar first = (Calendar) cal.clone();
+ Calendar first = cal.clone();
while (!includesDate(first)) {
first.add(Calendar.MINUTE, 1);
}
@@ -1220,7 +1220,7 @@ public class TemporalExpressions implements Serializable {
if (minute == this.start || minute == this.end) {
return true;
}
- Calendar compareCal = (Calendar) cal.clone();
+ Calendar compareCal = cal.clone();
compareCal.set(Calendar.MINUTE, this.start);
while (compareCal.get(Calendar.MINUTE) != this.end) {
if (compareCal.get(Calendar.MINUTE) == minute) {
@@ -1233,7 +1233,7 @@ public class TemporalExpressions implements Serializable {
@Override
public boolean isSubstitutionCandidate(Calendar cal,
TemporalExpression expressionToTest) {
- Calendar checkCal = (Calendar) cal.clone();
+ Calendar checkCal = cal.clone();
checkCal.add(Calendar.MINUTE, -1);
while (!includesDate(checkCal)) {
if (expressionToTest.includesDate(checkCal)) {
@@ -1246,7 +1246,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar next(Calendar cal, ExpressionContext context) {
- Calendar next = (Calendar) cal.clone();
+ Calendar next = cal.clone();
if (includesDate(next)) {
next.add(Calendar.MINUTE, 1);
}
@@ -1334,7 +1334,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar first(Calendar cal) {
- Calendar first = (Calendar) cal.clone();
+ Calendar first = cal.clone();
first.set(Calendar.DAY_OF_MONTH, 1);
while (!includesDate(first)) {
first.add(Calendar.MONTH, 1);
@@ -1362,7 +1362,7 @@ public class TemporalExpressions implements Serializable {
if (month == this.start || month == this.end) {
return true;
}
- Calendar compareCal = (Calendar) cal.clone();
+ Calendar compareCal = cal.clone();
while (compareCal.get(Calendar.MONTH) != this.start) {
compareCal.add(Calendar.MONTH, 1);
}
@@ -1377,7 +1377,7 @@ public class TemporalExpressions implements Serializable {
@Override
public boolean isSubstitutionCandidate(Calendar cal,
TemporalExpression expressionToTest) {
- Calendar checkCal = (Calendar) cal.clone();
+ Calendar checkCal = cal.clone();
checkCal.add(Calendar.MONTH, -1);
while (!includesDate(checkCal)) {
if (expressionToTest.includesDate(checkCal)) {
@@ -1390,7 +1390,7 @@ public class TemporalExpressions implements Serializable {
@Override
public Calendar next(Calendar cal, ExpressionContext context) {
- Calendar next = (Calendar) cal.clone();
+ Calendar next = cal.clone();
next.set(Calendar.DAY_OF_MONTH, 1);
next.add(Calendar.MONTH, 1);
while (!includesDate(next)) {
