This is an automated email from the ASF dual-hosted git repository.
zhangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 118e334 Fix ParsePathUtil#parameterEquals method
ArrayIndexOutOfBoundsException error and some typo (#5216)
118e334 is described below
commit 118e334e7c46e2475e0e7a616b185cdef63d5302
Author: yangy <[email protected]>
AuthorDate: Sat Aug 1 16:16:57 2020 +0800
Fix ParsePathUtil#parameterEquals method ArrayIndexOutOfBoundsException
error and some typo (#5216)
---
.../skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java | 8 ++++----
.../mvc/commons/interceptor/RequestMappingMethodInterceptor.java | 4 ++--
.../mvc/commons/interceptor/RestMappingMethodInterceptor.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java
b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java
index bd2e8af..1df9dd7 100644
---
a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java
+++
b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java
@@ -29,7 +29,7 @@ import java.util.function.Function;
*/
public class ParsePathUtil {
- public static String recursiveParseMethodAnnotaion(Method method,
Function<Method, String> parseFunc) {
+ public static String recursiveParseMethodAnnotation(Method method,
Function<Method, String> parseFunc) {
String result = parseFunc.apply(method);
if (Objects.isNull(result)) {
Class<?> declaringClass = method.getDeclaringClass();
@@ -38,9 +38,9 @@ public class ParsePathUtil {
return Optional.ofNullable(result).orElse("");
}
- private static String recursiveMatches(Class claz, String methodName,
Parameter[] parameters,
+ private static String recursiveMatches(Class clazz, String methodName,
Parameter[] parameters,
Function<Method, String> parseFunc) {
- Class<?>[] interfaces = claz.getInterfaces();
+ Class<?>[] interfaces = clazz.getInterfaces();
for (Class<?> implInterface : interfaces) {
String path = recursiveMatches(implInterface, methodName,
parameters, parseFunc);
if (Objects.nonNull(path)) {
@@ -57,7 +57,7 @@ public class ParsePathUtil {
}
private static boolean parameterEquals(Parameter[] p1, Parameter[] p2) {
- if (p1.length != p1.length) {
+ if (p1.length != p2.length) {
return false;
}
for (int i = 0; i < p1.length; i++) {
diff --git
a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RequestMappingMethodInterceptor.java
b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RequestMappingMethodInterceptor.java
index b2e66db..f833440 100644
---
a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RequestMappingMethodInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RequestMappingMethodInterceptor.java
@@ -31,7 +31,7 @@ import java.lang.reflect.Method;
public class RequestMappingMethodInterceptor extends AbstractMethodInterceptor
{
@Override
public String getRequestURL(Method method) {
- return ParsePathUtil.recursiveParseMethodAnnotaion(method, m -> {
+ return ParsePathUtil.recursiveParseMethodAnnotation(method, m -> {
String requestURL = null;
RequestMapping methodRequestMapping =
AnnotationUtils.getAnnotation(m, RequestMapping.class);
if (methodRequestMapping != null) {
@@ -47,7 +47,7 @@ public class RequestMappingMethodInterceptor extends
AbstractMethodInterceptor {
@Override
public String getAcceptedMethodTypes(Method method) {
- return ParsePathUtil.recursiveParseMethodAnnotaion(method, m -> {
+ return ParsePathUtil.recursiveParseMethodAnnotation(method, m -> {
RequestMapping methodRequestMapping =
AnnotationUtils.getAnnotation(m, RequestMapping.class);
if (methodRequestMapping == null ||
methodRequestMapping.method().length == 0) {
return null;
diff --git
a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RestMappingMethodInterceptor.java
b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RestMappingMethodInterceptor.java
index 8878017..3bb3a1d 100644
---
a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RestMappingMethodInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RestMappingMethodInterceptor.java
@@ -36,7 +36,7 @@ import java.lang.reflect.Method;
public class RestMappingMethodInterceptor extends AbstractMethodInterceptor {
@Override
public String getRequestURL(Method method) {
- return ParsePathUtil.recursiveParseMethodAnnotaion(method, m -> {
+ return ParsePathUtil.recursiveParseMethodAnnotation(method, m -> {
String requestURL = null;
GetMapping getMapping = AnnotationUtils.getAnnotation(m,
GetMapping.class);
PostMapping postMapping = AnnotationUtils.getAnnotation(m,
PostMapping.class);
