Polish switch statements

sbrannen · sbrannen · commit 3476402a75e1 · 2023-12-21T17:30:56.000+01:00
diff --git a/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java b/spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
@@ -117,11 +117,8 @@ public static Publisher<?> invokeSuspendingFunction(CoroutineContext context, Me
 					int index = 0;
 					for (KParameter parameter : function.getParameters()) {
 						switch (parameter.getKind()) {
-							case INSTANCE:
-								argMap.put(parameter, target);
-								break;
-							case VALUE:
-							case EXTENSION_RECEIVER:
+							case INSTANCE -> argMap.put(parameter, target);
+							case VALUE, EXTENSION_RECEIVER -> {
 								if (!parameter.isOptional() || args[index] != null) {
 									if (parameter.getType().getClassifier() instanceof KClass<?> kClass && kClass.isValue()) {
 										Class<?> javaClass = JvmClassMappingKt.getJavaClass(kClass);
@@ -134,8 +131,7 @@ public static Publisher<?> invokeSuspendingFunction(CoroutineContext context, Me
 									}
 								}
 								index++;
-								break;
-
+							}
 						}
 					}
 					return KCallables.callSuspendBy(function, argMap, continuation);
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
@@ -318,11 +318,8 @@ public static Object invokeFunction(Method method, Object target, Object[] args)
 			int index = 0;
 			for (KParameter parameter : function.getParameters()) {
 				switch (parameter.getKind()) {
-					case INSTANCE:
-						argMap.put(parameter, target);
-						break;
-					case VALUE:
-					case EXTENSION_RECEIVER:
+					case INSTANCE -> argMap.put(parameter, target);
+					case VALUE, EXTENSION_RECEIVER -> {
 						if (!parameter.isOptional() || args[index] != null) {
 							if (parameter.getType().getClassifier() instanceof KClass<?> kClass && kClass.isValue()) {
 								Class<?> javaClass = JvmClassMappingKt.getJavaClass(kClass);
@@ -335,8 +332,7 @@ public static Object invokeFunction(Method method, Object target, Object[] args)
 							}
 						}
 						index++;
-						break;
-
+					}
 				}
 			}
 			Object result = function.callBy(argMap);
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
@@ -329,11 +329,8 @@ public static Object invokeFunction(Method method, Object target, Object[] args,
 				int index = 0;
 				for (KParameter parameter : function.getParameters()) {
 					switch (parameter.getKind()) {
-						case INSTANCE:
-							argMap.put(parameter, target);
-							break;
-						case VALUE:
-						case EXTENSION_RECEIVER:
+						case INSTANCE -> argMap.put(parameter, target);
+						case VALUE, EXTENSION_RECEIVER -> {
 							if (!parameter.isOptional() || args[index] != null) {
 								if (parameter.getType().getClassifier() instanceof KClass<?> kClass && kClass.isValue()) {
 									Class<?> javaClass = JvmClassMappingKt.getJavaClass(kClass);
@@ -346,7 +343,7 @@ public static Object invokeFunction(Method method, Object target, Object[] args,
 								}
 							}
 							index++;
-							break;
+						}
 					}
 				}
 				Object result = function.callBy(argMap);

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,8 @@ public static Publisher<?> invokeSuspendingFunction(CoroutineContext context, Me`
`117`	`117`	`int index = 0;`
`118`	`118`	`for (KParameter parameter : function.getParameters()) {`
`119`	`119`	`switch (parameter.getKind()) {`
`120`		`- case INSTANCE:`
`121`		`- argMap.put(parameter, target);`
`122`		`- break;`
`123`		`- case VALUE:`
`124`		`- case EXTENSION_RECEIVER:`
	`120`	`+ case INSTANCE -> argMap.put(parameter, target);`
	`121`	`+ case VALUE, EXTENSION_RECEIVER -> {`
`125`	`122`	`if (!parameter.isOptional() \|\| args[index] != null) {`
`126`	`123`	`if (parameter.getType().getClassifier() instanceof KClass<?> kClass && kClass.isValue()) {`
`127`	`124`	`Class<?> javaClass = JvmClassMappingKt.getJavaClass(kClass);`
`@@ -134,8 +131,7 @@ public static Publisher<?> invokeSuspendingFunction(CoroutineContext context, Me`
`134`	`131`	`}`
`135`	`132`	`}`
`136`	`133`	`index++;`
`137`		`- break;`
`138`		`-`
	`134`	`+ }`
`139`	`135`	`}`
`140`	`136`	`}`
`141`	`137`	`return KCallables.callSuspendBy(function, argMap, continuation);`
Original file line number	Diff line number	Diff line change
`@@ -318,11 +318,8 @@ public static Object invokeFunction(Method method, Object target, Object[] args)`
`318`	`318`	`int index = 0;`
`319`	`319`	`for (KParameter parameter : function.getParameters()) {`
`320`	`320`	`switch (parameter.getKind()) {`
`321`		`- case INSTANCE:`
`322`		`- argMap.put(parameter, target);`
`323`		`- break;`
`324`		`- case VALUE:`
`325`		`- case EXTENSION_RECEIVER:`
	`321`	`+ case INSTANCE -> argMap.put(parameter, target);`
	`322`	`+ case VALUE, EXTENSION_RECEIVER -> {`
`326`	`323`	`if (!parameter.isOptional() \|\| args[index] != null) {`
`327`	`324`	`if (parameter.getType().getClassifier() instanceof KClass<?> kClass && kClass.isValue()) {`
`328`	`325`	`Class<?> javaClass = JvmClassMappingKt.getJavaClass(kClass);`
`@@ -335,8 +332,7 @@ public static Object invokeFunction(Method method, Object target, Object[] args)`
`335`	`332`	`}`
`336`	`333`	`}`
`337`	`334`	`index++;`
`338`		`- break;`
`339`		`-`
	`335`	`+ }`
`340`	`336`	`}`
`341`	`337`	`}`
`342`	`338`	`Object result = function.callBy(argMap);`
Original file line number	Diff line number	Diff line change
`@@ -329,11 +329,8 @@ public static Object invokeFunction(Method method, Object target, Object[] args,`
`329`	`329`	`int index = 0;`
`330`	`330`	`for (KParameter parameter : function.getParameters()) {`
`331`	`331`	`switch (parameter.getKind()) {`
`332`		`- case INSTANCE:`
`333`		`- argMap.put(parameter, target);`
`334`		`- break;`
`335`		`- case VALUE:`
`336`		`- case EXTENSION_RECEIVER:`
	`332`	`+ case INSTANCE -> argMap.put(parameter, target);`
	`333`	`+ case VALUE, EXTENSION_RECEIVER -> {`
`337`	`334`	`if (!parameter.isOptional() \|\| args[index] != null) {`
`338`	`335`	`if (parameter.getType().getClassifier() instanceof KClass<?> kClass && kClass.isValue()) {`
`339`	`336`	`Class<?> javaClass = JvmClassMappingKt.getJavaClass(kClass);`
`@@ -346,7 +343,7 @@ public static Object invokeFunction(Method method, Object target, Object[] args,`
`346`	`343`	`}`
`347`	`344`	`}`
`348`	`345`	`index++;`
`349`		`- break;`
	`346`	`+ }`
`350`	`347`	`}`
`351`	`348`	`}`
`352`	`349`	`Object result = function.callBy(argMap);`