From dab7e03c93edf32fdcb2ccae28a161be772f4862 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Fri, 20 Oct 2023 18:31:37 +0200 Subject: [PATCH] Polish See gh-28041 --- .../test/web/servlet/setup/MockMvcFilterDecorator.java | 4 ++-- .../test/web/servlet/setup/MockMvcFilterDecoratorTests.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecorator.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecorator.java index baf990ea6e3..46c583bdd55 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecorator.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecorator.java @@ -49,9 +49,9 @@ final class MockMvcFilterDecorator implements Filter { private static final String ALL_MAPPING_PATTERN = "*"; - private static final String EXTENSION_MAPPING_PATTERN = ALL_MAPPING_PATTERN + "."; + private static final String EXTENSION_MAPPING_PATTERN = "*."; - private static final String PATH_MAPPING_PATTERN = "/" + ALL_MAPPING_PATTERN; + private static final String PATH_MAPPING_PATTERN = "/*"; private final Filter delegate; diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java index af93e0d7386..4b53b76880e 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/MockMvcFilterDecoratorTests.java @@ -90,21 +90,25 @@ public class MockMvcFilterDecoratorTests { @Test public void matchPathMappingAllFolder() throws Exception { + assertFilterInvoked("/test/this", "*"); assertFilterInvoked("/test/this", "/*"); } @Test public void matchPathMappingAll() throws Exception { assertFilterInvoked("/test", "*"); + assertFilterInvoked("/test", "/*"); } @Test public void matchPathMappingAllContextRoot() throws Exception { + assertFilterInvoked("", "*"); assertFilterInvoked("", "/*"); } @Test public void matchPathMappingContextRootAndSlash() throws Exception { + assertFilterInvoked("/", "*"); assertFilterInvoked("/", "/*"); }