From 5288641c5055c83b8cef61bc4c0ed923fa59e995 Mon Sep 17 00:00:00 2001 From: diguage Date: Sat, 3 Jun 2017 23:06:30 +0800 Subject: [PATCH 1/2] Refactor duplicated code See gh-1445 --- ...andardReflectionParameterNameDiscoverer.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java index a06eeb6354e..7c17ae44949 100644 --- a/spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java +++ b/spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java @@ -33,21 +33,15 @@ public class StandardReflectionParameterNameDiscoverer implements ParameterNameD @Override public String[] getParameterNames(Method method) { - Parameter[] parameters = method.getParameters(); - String[] parameterNames = new String[parameters.length]; - for (int i = 0; i < parameters.length; i++) { - Parameter param = parameters[i]; - if (!param.isNamePresent()) { - return null; - } - parameterNames[i] = param.getName(); - } - return parameterNames; + return getParameterNames(method.getParameters()); } @Override public String[] getParameterNames(Constructor ctor) { - Parameter[] parameters = ctor.getParameters(); + return getParameterNames(ctor.getParameters()); + } + + private String[] getParameterNames(Parameter[] parameters) { String[] parameterNames = new String[parameters.length]; for (int i = 0; i < parameters.length; i++) { Parameter param = parameters[i]; @@ -58,5 +52,4 @@ public class StandardReflectionParameterNameDiscoverer implements ParameterNameD } return parameterNames; } - } From 6e3a9cbbb49bf2b76e63ff4b65fb484841177e53 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 4 Jun 2017 13:06:09 +0200 Subject: [PATCH 2/2] Polish "Refactor duplicated code" Closes gh-1445 --- .../core/StandardReflectionParameterNameDiscoverer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java index 7c17ae44949..47259fc361a 100644 --- a/spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java +++ b/spring-core/src/main/java/org/springframework/core/StandardReflectionParameterNameDiscoverer.java @@ -52,4 +52,5 @@ public class StandardReflectionParameterNameDiscoverer implements ParameterNameD } return parameterNames; } + }