Skip to content

Commit b75d40c

Browse files
committed
Changes per review comments
1 parent df91fd0 commit b75d40c

2 files changed

Lines changed: 6 additions & 19 deletions

File tree

modules/flowable-dmn-xml-converter/src/main/java/org/flowable/dmn/converter/child/InputEntryParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,22 +104,22 @@ protected void migrateExtensionElement(DmnExtensionElement extensionElement, Inp
104104

105105
String elementText = extensionElement.getElementText();
106106
String typeRef = inputClause.getInputExpression().getTypeRef();
107-
String newElementText = null;
107+
String newElementText;
108108
if ("collection".equalsIgnoreCase(typeRef)) {
109109
newElementText = switch (elementText) {
110110
case "IN" -> "ALL OF";
111111
case "NOT IN" -> "NONE OF";
112112
case "ANY" -> "ANY OF";
113113
case "NOT ANY" -> "NOT ALL OF";
114-
default -> newElementText;
114+
default -> null;
115115
};
116116
} else {
117117
newElementText = switch (elementText) {
118118
case "IN" -> "IS IN";
119119
case "NOT IN" -> "IS NOT IN";
120120
case "ANY" -> "IS IN";
121121
case "NOT ANY" -> "IS NOT IN";
122-
default -> newElementText;
122+
default -> null;
123123
};
124124
}
125125

modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/calendar/CronExpression.java

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
import java.io.Serializable;
2323
import java.text.ParseException;
24+
import java.time.Month;
25+
import java.time.Year;
2426
import java.util.Calendar;
2527
import java.util.Date;
2628
import java.util.HashMap;
@@ -1601,22 +1603,7 @@ protected boolean isLeapYear(int year) {
16011603
}
16021604

16031605
protected int getLastDayOfMonth(int monthNum, int year) {
1604-
1605-
return switch (monthNum) {
1606-
case 1 -> 31;
1607-
case 2 -> isLeapYear(year) ? 29 : 28;
1608-
case 3 -> 31;
1609-
case 4 -> 30;
1610-
case 5 -> 31;
1611-
case 6 -> 30;
1612-
case 7 -> 31;
1613-
case 8 -> 31;
1614-
case 9 -> 30;
1615-
case 10 -> 31;
1616-
case 11 -> 30;
1617-
case 12 -> 31;
1618-
default -> throw new IllegalArgumentException("Illegal month number: " + monthNum);
1619-
};
1606+
return Month.of(monthNum).length(Year.isLeap(year));
16201607
}
16211608

16221609
private void readObject(java.io.ObjectInputStream stream) throws java.io.IOException, ClassNotFoundException {

0 commit comments

Comments
 (0)