From 160a4a3676b15863970df71c83641d9e35ef5dd9 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 11 Jan 2021 08:28:59 -0700 Subject: [PATCH] Reformat MvcRequestMatcher - Moved related private methods together Issue gh-9284 --- .../util/matcher/MvcRequestMatcher.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcher.java b/web/src/main/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcher.java index 9c718e6a1e..70c96faba5 100644 --- a/web/src/main/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcher.java @@ -76,15 +76,6 @@ public class MvcRequestMatcher implements RequestMatcher, RequestVariablesExtrac return matchResult != null; } - private MatchableHandlerMapping getMapping(HttpServletRequest request) { - try { - return this.introspector.getMatchableHandlerMapping(request); - } - catch (Throwable ex) { - return null; - } - } - @Override @Deprecated public Map extractUriTemplateVariables(HttpServletRequest request) { @@ -109,6 +100,15 @@ public class MvcRequestMatcher implements RequestMatcher, RequestVariablesExtrac || this.servletPath != null && !this.servletPath.equals(request.getServletPath()); } + private MatchableHandlerMapping getMapping(HttpServletRequest request) { + try { + return this.introspector.getMatchableHandlerMapping(request); + } + catch (Throwable ex) { + return null; + } + } + /** * @param method the method to set */