From 65d3e5ec8135c93fa639e58dde883f02cda0cdde Mon Sep 17 00:00:00 2001 From: LHHDZ Date: Tue, 16 Jul 2024 17:45:18 +0800 Subject: [PATCH 1/4] fix: no such method at `HttpMethod.HEAD.matches` --- .../java/io/arex/inst/httpservlet/ServletAdviceHelper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java b/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java index 2f72b4032..a8d518781 100644 --- a/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java +++ b/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java @@ -28,6 +28,9 @@ import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.async.DeferredResult; import org.springframework.web.method.support.InvocableHandlerMethod; +import sun.net.www.http.HttpClient; + +import javax.print.DocFlavor; /** * ServletAdviceHelper @@ -210,8 +213,8 @@ private static boolean shouldSkip(ServletAdapter adapter } // skip if pre-request http-method is HEAD or OPTIONS - if (HttpMethod.HEAD.matches(adapter.getMethod(httpServletRequest)) - || HttpMethod.OPTIONS.matches(adapter.getMethod(httpServletRequest))) { + if (HttpMethod.HEAD.name().equals(adapter.getMethod(httpServletRequest)) + || HttpMethod.OPTIONS.name().equals(adapter.getMethod(httpServletRequest))) { return true; } From 45a97d6133664e9ee5d969c7ecab1f62d3373289 Mon Sep 17 00:00:00 2001 From: LHHDZ Date: Tue, 16 Jul 2024 17:45:18 +0800 Subject: [PATCH 2/4] fix: no such method at `HttpMethod.HEAD.matches` --- .../arex/inst/httpservlet/ServletAdviceHelper.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java b/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java index 2f72b4032..55a92e912 100644 --- a/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java +++ b/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java @@ -210,8 +210,8 @@ private static boolean shouldSkip(ServletAdapter adapter } // skip if pre-request http-method is HEAD or OPTIONS - if (HttpMethod.HEAD.matches(adapter.getMethod(httpServletRequest)) - || HttpMethod.OPTIONS.matches(adapter.getMethod(httpServletRequest))) { + if (HttpMethod.HEAD.name().equals(adapter.getMethod(httpServletRequest)) + || HttpMethod.OPTIONS.name().equals(adapter.getMethod(httpServletRequest))) { return true; } @@ -240,13 +240,13 @@ private static boolean shouldSkip(ServletAdapter adapter String pattern = adapter.getPattern(httpServletRequest); // As long as one parameter is hit in includeServiceOperations, the operation will not be skipped if (CollectionUtil.isNotEmpty(Config.get().getIncludeServiceOperations()) && - !(IgnoreUtils.includeOperation(pattern) || - IgnoreUtils.includeOperation(requestURI))) { + !(IgnoreUtils.includeOperation(pattern) || + IgnoreUtils.includeOperation(requestURI))) { return true; } // As long as one parameter is hit in excludeServiceOperations, the operation will be skipped if (IgnoreUtils.excludeOperation(pattern) || - IgnoreUtils.excludeOperation(requestURI)) { + IgnoreUtils.excludeOperation(requestURI)) { return true; } @@ -265,7 +265,7 @@ private static boolean shouldSkip(ServletAdapter adapter } private static String getRedirectRecordId(ServletAdapter adapter, - TRequest httpServletRequest) { + TRequest httpServletRequest) { String redirectRecordId = adapter.getParameterFromQueryString(httpServletRequest, ArexConstants.RECORD_ID); if (StringUtil.isEmpty(redirectRecordId)) { return null; From a0fd58fc5d649b41c983c9fef0f2f2ac9f1aebc7 Mon Sep 17 00:00:00 2001 From: Mark Zhang Date: Wed, 17 Jul 2024 11:55:43 +0800 Subject: [PATCH 3/4] Remove unused imports --- .../java/io/arex/inst/httpservlet/ServletAdviceHelper.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java b/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java index 65c5d441c..3f96dfa1f 100644 --- a/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java +++ b/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java @@ -28,9 +28,7 @@ import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.async.DeferredResult; import org.springframework.web.method.support.InvocableHandlerMethod; -import sun.net.www.http.HttpClient; -import javax.print.DocFlavor; /** * ServletAdviceHelper @@ -244,7 +242,7 @@ private static boolean shouldSkip(ServletAdapter adapter // As long as one parameter is hit in includeServiceOperations, the operation will not be skipped if (CollectionUtil.isNotEmpty(Config.get().getIncludeServiceOperations()) && !(IgnoreUtils.includeOperation(pattern) || - IgnoreUtils.includeOperation(requestURI))) { + IgnoreUtils.includeOperation(requestURI))) { return true; } // As long as one parameter is hit in excludeServiceOperations, the operation will be skipped @@ -268,7 +266,7 @@ private static boolean shouldSkip(ServletAdapter adapter } private static String getRedirectRecordId(ServletAdapter adapter, - TRequest httpServletRequest) { + TRequest httpServletRequest) { String redirectRecordId = adapter.getParameterFromQueryString(httpServletRequest, ArexConstants.RECORD_ID); if (StringUtil.isEmpty(redirectRecordId)) { return null; From cdfa12b9832b7ddf78c76b55fa9da91fe1867920 Mon Sep 17 00:00:00 2001 From: Mark Zhang Date: Wed, 17 Jul 2024 11:56:18 +0800 Subject: [PATCH 4/4] Update ServletAdviceHelper.java --- .../main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java b/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java index 3f96dfa1f..0d2921bfe 100644 --- a/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java +++ b/arex-instrumentation/servlet/arex-httpservlet/src/main/java/io/arex/inst/httpservlet/ServletAdviceHelper.java @@ -29,7 +29,6 @@ import org.springframework.web.context.request.async.DeferredResult; import org.springframework.web.method.support.InvocableHandlerMethod; - /** * ServletAdviceHelper */