Browse Source

Polish switch statements

pull/31886/head
Sam Brannen 2 years ago
parent
commit
3476402a75
  1. 10
      spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
  2. 10
      spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
  3. 9
      spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java

10
spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java

@ -117,11 +117,8 @@ public abstract class CoroutinesUtils { @@ -117,11 +117,8 @@ public abstract class CoroutinesUtils {
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 abstract class CoroutinesUtils { @@ -134,8 +131,7 @@ public abstract class CoroutinesUtils {
}
}
index++;
break;
}
}
}
return KCallables.callSuspendBy(function, argMap, continuation);

10
spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java

@ -318,11 +318,8 @@ public class InvocableHandlerMethod extends HandlerMethod { @@ -318,11 +318,8 @@ public class InvocableHandlerMethod extends HandlerMethod {
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 class InvocableHandlerMethod extends HandlerMethod { @@ -335,8 +332,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
}
}
index++;
break;
}
}
}
Object result = function.callBy(argMap);

9
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java

@ -329,11 +329,8 @@ public class InvocableHandlerMethod extends HandlerMethod { @@ -329,11 +329,8 @@ public class InvocableHandlerMethod extends HandlerMethod {
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 class InvocableHandlerMethod extends HandlerMethod { @@ -346,7 +343,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
}
}
index++;
break;
}
}
}
Object result = function.callBy(argMap);

Loading…
Cancel
Save