From e02c06887622dcad2f1dbc855a2d95208f28e93e Mon Sep 17 00:00:00 2001 From: tugjg Date: Sat, 31 Aug 2024 14:31:02 -0400 Subject: [PATCH 1/2] Address unnecessary method invocation Closes gh-15714 --- .../config/annotation/web/AbstractRequestMatcherRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java index 169815dbce4..e9a9144aac0 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java @@ -628,7 +628,7 @@ static class DispatcherServletRequestMatcher implements RequestMatcher { public boolean matches(HttpServletRequest request) { String name = request.getHttpServletMapping().getServletName(); ServletRegistration registration = this.servletContext.getServletRegistration(name); - Assert.notNull(registration, computeErrorMessage(this.servletContext.getServletRegistrations().values())); + Assert.notNull(registration, () -> computeErrorMessage(this.servletContext.getServletRegistrations().values())); try { Class clazz = Class.forName(registration.getClassName()); return DispatcherServlet.class.isAssignableFrom(clazz); From 6e464c2642e0aecfbe9155a66809eadc7c8cc743 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Tue, 3 Sep 2024 15:33:16 -0600 Subject: [PATCH 2/2] Update Formatting Issue gh-15714 --- .../config/annotation/web/AbstractRequestMatcherRegistry.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java index e9a9144aac0..c9ed6220d6c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java @@ -628,7 +628,8 @@ static class DispatcherServletRequestMatcher implements RequestMatcher { public boolean matches(HttpServletRequest request) { String name = request.getHttpServletMapping().getServletName(); ServletRegistration registration = this.servletContext.getServletRegistration(name); - Assert.notNull(registration, () -> computeErrorMessage(this.servletContext.getServletRegistrations().values())); + Assert.notNull(registration, + () -> computeErrorMessage(this.servletContext.getServletRegistrations().values())); try { Class clazz = Class.forName(registration.getClassName()); return DispatcherServlet.class.isAssignableFrom(clazz);