From da814e01c7873dc0475efab2c5753284182a260e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 4 Jul 2023 21:52:36 +0200 Subject: [PATCH] Polishing --- .../messaging/handler/HandlerMethod.java | 10 ++++------ .../org/springframework/web/method/HandlerMethod.java | 5 +++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java index 7a834c5d2f..f646afba24 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -212,7 +212,7 @@ public class HandlerMethod { /** * If the bean method is a bridge method, this method returns the bridged - * (user-defined) method. Otherwise it returns the same method as {@link #getMethod()}. + * (user-defined) method. Otherwise, it returns the same method as {@link #getMethod()}. */ protected Method getBridgedMethod() { return this.bridgedMethod; @@ -298,8 +298,8 @@ public class HandlerMethod { * Return a short representation of this handler method for log message purposes. */ public String getShortLogMessage() { - int args = this.method.getParameterCount(); - return getBeanType().getSimpleName() + "#" + this.method.getName() + "[" + args + " args]"; + return getBeanType().getSimpleName() + "#" + this.method.getName() + + "[" + this.method.getParameterCount() + " args]"; } @@ -365,13 +365,11 @@ public class HandlerMethod { } protected String formatInvokeError(String text, Object[] args) { - String formattedArgs = IntStream.range(0, args.length) .mapToObj(i -> (args[i] != null ? "[" + i + "] [type=" + args[i].getClass().getName() + "] [value=" + args[i] + "]" : "[" + i + "] [null]")) .collect(Collectors.joining(",\n", " ", " ")); - return text + "\n" + "Endpoint [" + getBeanType().getName() + "]\n" + "Method [" + getBridgedMethod().toGenericString() + "] " + diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java index 97fef625c2..226d156791 100644 --- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java +++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -218,6 +218,7 @@ public class HandlerMethod { this.description = handlerMethod.description; } + private MethodParameter[] initMethodParameters() { int count = this.bridgedMethod.getParameterCount(); MethodParameter[] result = new MethodParameter[count]; @@ -248,7 +249,7 @@ public class HandlerMethod { for (Class paramType : method.getParameterTypes()) { joiner.add(paramType.getSimpleName()); } - return beanType.getName() + "#" + method.getName() + joiner.toString(); + return beanType.getName() + "#" + method.getName() + joiner; }