Chore: use enhanced switch syntax

Author: dbmalkovsky

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

@@ -104,37 +104,23 @@ protected void migrateExtensionElement(DmnExtensionElement extensionElement, Inp
 
         String elementText = extensionElement.getElementText();
         String typeRef = inputClause.getInputExpression().getTypeRef();
-        String newElementText = null;
+        String newElementText;
         if ("collection".equalsIgnoreCase(typeRef)) {
-            switch (elementText) {
-                case "IN":
-                    newElementText = "ALL OF";
-                    break;
-                case "NOT IN":
-                    newElementText = "NONE OF";
-                    break;
-                case "ANY":
-                    newElementText = "ANY OF";
-                    break;
-                case "NOT ANY":
-                    newElementText = "NOT ALL OF";
-                    break;
-            }
+            newElementText = switch (elementText) {
+                case "IN" -> "ALL OF";
+                case "NOT IN" -> "NONE OF";
+                case "ANY" -> "ANY OF";
+                case "NOT ANY" -> "NOT ALL OF";
+                default -> null;
+            };
         } else {
-            switch (elementText) {
-                case "IN":
-                    newElementText = "IS IN";
-                    break;
-                case "NOT IN":
-                    newElementText = "IS NOT IN";
-                    break;
-                case "ANY":
-                    newElementText = "IS IN";
-                    break;
-                case "NOT ANY":
-                    newElementText = "IS NOT IN";
-                    break;
-            }
+            newElementText = switch (elementText) {
+                case "IN" -> "IS IN";
+                case "NOT IN" -> "IS NOT IN";
+                case "ANY" -> "IS IN";
+                case "NOT ANY" -> "IS NOT IN";
+                default -> null;
+            };
         }
 
         if (newElementText != null) {

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

@@ -21,6 +21,8 @@
 
 import java.io.Serializable;
 import java.text.ParseException;
+import java.time.Month;
+import java.time.Year;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -1061,30 +1063,16 @@ protected void addToSet(int val, int end, int incr, int type) throws ParseExcept
         // type, and using modulus max to determine the value being added.
         int max = -1;
         if (stopAt < startAt) {
-            switch (type) {
-            case SECOND:
-                max = 60;
-                break;
-            case MINUTE:
-                max = 60;
-                break;
-            case HOUR:
-                max = 24;
-                break;
-            case MONTH:
-                max = 12;
-                break;
-            case DAY_OF_WEEK:
-                max = 7;
-                break;
-            case DAY_OF_MONTH:
-                max = 31;
-                break;
-            case YEAR:
-                throw new IllegalArgumentException("Start year must be less than stop year");
-            default:
-                throw new IllegalArgumentException("Unexpected type encountered");
-            }
+            max = switch (type) {
+                case SECOND -> 60;
+                case MINUTE -> 60;
+                case HOUR -> 24;
+                case MONTH -> 12;
+                case DAY_OF_WEEK -> 7;
+                case DAY_OF_MONTH -> 31;
+                case YEAR -> throw new IllegalArgumentException("Start year must be less than stop year");
+                default -> throw new IllegalArgumentException("Unexpected type encountered");
+            };
             stopAt += max;
         }
 
@@ -1108,24 +1096,16 @@ protected void addToSet(int val, int end, int incr, int type) throws ParseExcept
     }
 
     TreeSet<Integer> getSet(int type) {
-        switch (type) {
-        case SECOND:
-            return seconds;
-        case MINUTE:
-            return minutes;
-        case HOUR:
-            return hours;
-        case DAY_OF_MONTH:
-            return daysOfMonth;
-        case MONTH:
-            return months;
-        case DAY_OF_WEEK:
-            return daysOfWeek;
-        case YEAR:
-            return years;
-        default:
-            return null;
-        }
+        return switch (type) {
+            case SECOND -> seconds;
+            case MINUTE -> minutes;
+            case HOUR -> hours;
+            case DAY_OF_MONTH -> daysOfMonth;
+            case MONTH -> months;
+            case DAY_OF_WEEK -> daysOfWeek;
+            case YEAR -> years;
+            default -> null;
+        };
     }
 
     protected ValueSet getValue(int v, String s, int i) {
@@ -1623,35 +1603,7 @@ protected boolean isLeapYear(int year) {
     }
 
     protected int getLastDayOfMonth(int monthNum, int year) {
-
-        switch (monthNum) {
-        case 1:
-            return 31;
-        case 2:
-            return isLeapYear(year) ? 29 : 28;
-        case 3:
-            return 31;
-        case 4:
-            return 30;
-        case 5:
-            return 31;
-        case 6:
-            return 30;
-        case 7:
-            return 31;
-        case 8:
-            return 31;
-        case 9:
-            return 30;
-        case 10:
-            return 31;
-        case 11:
-            return 30;
-        case 12:
-            return 31;
-        default:
-            throw new IllegalArgumentException("Illegal month number: " + monthNum);
-        }
+        return Month.of(monthNum).length(Year.isLeap(year));
     }
 
     private void readObject(java.io.ObjectInputStream stream) throws java.io.IOException, ClassNotFoundException {

modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/behavior/CallActivityBehavior.java

@@ -240,17 +240,11 @@ public void execute(DelegateExecution execution) {
     }
 
     protected ProcessDefinition getProcessDefinition(DelegateExecution execution, CallActivity callActivity, ProcessEngineConfigurationImpl processEngineConfiguration) {
-        ProcessDefinition processDefinition;
-        switch (StringUtils.isNotEmpty(calledElementType) ? calledElementType : CALLED_ELEMENT_TYPE_KEY) {
-            case CALLED_ELEMENT_TYPE_ID:
-                processDefinition = getProcessDefinitionById(execution, processEngineConfiguration);
-                break;
-            case CALLED_ELEMENT_TYPE_KEY:
-                processDefinition = getProcessDefinitionByKey(execution, callActivity.isSameDeployment(), processEngineConfiguration);
-                break;
-            default:
-                throw new FlowableException("Unrecognized calledElementType [" + calledElementType + "] in " + execution);
-        }
+        ProcessDefinition processDefinition = switch (StringUtils.isNotEmpty(calledElementType) ? calledElementType : CALLED_ELEMENT_TYPE_KEY) {
+            case CALLED_ELEMENT_TYPE_ID -> getProcessDefinitionById(execution, processEngineConfiguration);
+            case CALLED_ELEMENT_TYPE_KEY -> getProcessDefinitionByKey(execution, callActivity.isSameDeployment(), processEngineConfiguration);
+            default -> throw new FlowableException("Unrecognized calledElementType [" + calledElementType + "] in " + execution);
+        };
         return processDefinition;
     }
 

modules/flowable-engine/src/test/java/org/flowable/engine/test/concurrency/SetRandomVariablesTaskListener.java

@@ -45,17 +45,13 @@ public void notify(DelegateTask delegateTask) {
     }
 
     protected Object getRandomValue() {
-        switch (new Random().nextInt(4)) {
-        case 0:
-            return new Random().nextLong();
-        case 1:
-            return new Random().nextDouble();
-        case 2:
-            return "Activiti is a light-weight workflow and Business Process Management (BPM) Platform";
-        default:
-            return new Random().nextBoolean();
-        // return "Some bytearray".getBytes();
-        }
+        return switch (new Random().nextInt(4)) {
+            case 0 -> new Random().nextLong();
+            case 1 -> new Random().nextDouble();
+            case 2 -> "Activiti is a light-weight workflow and Business Process Management (BPM) Platform";
+            default -> new Random().nextBoolean();
+            // return "Some bytearray".getBytes();
+        };
     }
 
 }

modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/authentication/ApacheDigester.java

@@ -43,21 +43,14 @@ public Digester getDigester() {
 
     private String encodePassword(CharSequence rawPassword, PasswordSalt passwordSalt) {
         String salt = rawPassword + passwordSalt.getSource().getSalt();
-        switch (digester) {
-            case MD5:
-                return DigestUtils.md5Hex(salt);
-            case SHA:
-                return DigestUtils.sha1Hex(salt);
-            case SHA256:
-                return DigestUtils.sha256Hex(salt);
-            case SHA348:
-                return DigestUtils.sha384Hex(salt);
-            case SHA512:
-                return DigestUtils.sha512Hex(salt);
-            default:
-                break;
-        }
-        return null;
+        return switch (digester) {
+            case MD5 -> DigestUtils.md5Hex(salt);
+            case SHA -> DigestUtils.sha1Hex(salt);
+            case SHA256 -> DigestUtils.sha256Hex(salt);
+            case SHA348 -> DigestUtils.sha384Hex(salt);
+            case SHA512 -> DigestUtils.sha512Hex(salt);
+            default -> null;
+        };
     }
 
     public enum Digester {

modules/flowable-idm-engine/src/main/java/org/flowable/idm/engine/impl/persistence/entity/AbstractIdmEngineEntityManager.java

@@ -33,23 +33,13 @@ public AbstractIdmEngineEntityManager(IdmEngineConfiguration idmEngineConfigurat
 
     @Override
     protected FlowableEntityEvent createEntityEvent(FlowableEngineEventType eventType, Entity entity) {
-        FlowableIdmEventType idmEventType;
-        switch (eventType) {
-            case ENTITY_CREATED:
-                idmEventType = FlowableIdmEventType.ENTITY_CREATED;
-                break;
-            case ENTITY_INITIALIZED:
-                idmEventType = FlowableIdmEventType.ENTITY_INITIALIZED;
-                break;
-            case ENTITY_UPDATED:
-                idmEventType = FlowableIdmEventType.ENTITY_UPDATED;
-                break;
-            case ENTITY_DELETED:
-                idmEventType = FlowableIdmEventType.ENTITY_DELETED;
-                break;
-            default:
-                idmEventType = null;
-        }
+        FlowableIdmEventType idmEventType = switch (eventType) {
+            case ENTITY_CREATED -> FlowableIdmEventType.ENTITY_CREATED;
+            case ENTITY_INITIALIZED -> FlowableIdmEventType.ENTITY_INITIALIZED;
+            case ENTITY_UPDATED -> FlowableIdmEventType.ENTITY_UPDATED;
+            case ENTITY_DELETED -> FlowableIdmEventType.ENTITY_DELETED;
+            default -> null;
+        };
 
         if (idmEventType != null) {
             return FlowableIdmEventBuilder.createEntityEvent(idmEventType, entity);