Fix issue with path matching options

Closes spring-projectsgh-23907
scope-demo · Nov 6, 2019 · baae184 · baae184
1 parent 50b75ba
commit baae184
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/...g/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java b/...g/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
@@ -163,7 +163,7 @@ protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handler
 					if (this.embeddedValueResolver != null) {
 						prefix = this.embeddedValueResolver.resolveStringValue(prefix);
 					}
-					info = RequestMappingInfo.paths(prefix).build().combine(info);
+					info = RequestMappingInfo.paths(prefix).options(this.config).build().combine(info);
 					break;
 				}
 			}

diff --git a/...a/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java b/...a/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
@@ -232,7 +232,7 @@ protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handler
 			}
 			String prefix = getPathPrefix(handlerType);
 			if (prefix != null) {
-				info = RequestMappingInfo.paths(prefix).build().combine(info);
+				info = RequestMappingInfo.paths(prefix).options(this.config).build().combine(info);
 			}
 		}
 		return info;

diff --git a/.../springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java b/.../springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
@@ -32,6 +32,7 @@
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.http.MediaType;
+import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.accept.ContentNegotiationManager;
@@ -122,10 +123,12 @@ public void useSuffixPatternMatch() {
 		assertThat(this.handlerMapping.useSuffixPatternMatch()).isFalse();
 
 		this.handlerMapping.setUseRegisteredSuffixPatternMatch(false);
-		assertThat(this.handlerMapping.useSuffixPatternMatch()).as("'false' registeredSuffixPatternMatch shouldn't impact suffixPatternMatch").isFalse();
+		assertThat(this.handlerMapping.useSuffixPatternMatch())
+				.as("'false' registeredSuffixPatternMatch shouldn't impact suffixPatternMatch").isFalse();
 
 		this.handlerMapping.setUseRegisteredSuffixPatternMatch(true);
-		assertThat(this.handlerMapping.useSuffixPatternMatch()).as("'true' registeredSuffixPatternMatch should enable suffixPatternMatch").isTrue();
+		assertThat(this.handlerMapping.useSuffixPatternMatch())
+				.as("'true' registeredSuffixPatternMatch should enable suffixPatternMatch").isTrue();
 	}
 
 	@Test
@@ -153,12 +156,32 @@ public void pathPrefix() throws NoSuchMethodException {
 		assertThat(info.getPatternsCondition().getPatterns()).isEqualTo(Collections.singleton("/api/user/{id}"));
 	}
 
+	@Test // gh-23907
+	public void pathPrefixPreservesPathMatchingSettings() throws NoSuchMethodException {
+		this.handlerMapping.setUseSuffixPatternMatch(false);
+		this.handlerMapping.setPathPrefixes(Collections.singletonMap("/api", HandlerTypePredicate.forAnyHandlerType()));
+		this.handlerMapping.afterPropertiesSet();
+
+		Method method = ComposedAnnotationController.class.getMethod("get");
+		RequestMappingInfo info = this.handlerMapping.getMappingForMethod(method, ComposedAnnotationController.class);
+
+		assertThat(info).isNotNull();
+
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/api/get");
+		assertThat(info.getPatternsCondition().getMatchingCondition(request)).isNotNull();
+
+		request = new MockHttpServletRequest("GET", "/api/get.pdf");
+		assertThat(info.getPatternsCondition().getMatchingCondition(request)).isNull();
+	}
+
 	@Test
 	public void resolveRequestMappingViaComposedAnnotation() throws Exception {
 		RequestMappingInfo info = assertComposedAnnotationMapping("postJson", "/postJson", RequestMethod.POST);
 
-		assertThat(info.getConsumesCondition().getConsumableMediaTypes().iterator().next().toString()).isEqualTo(MediaType.APPLICATION_JSON_VALUE);
-		assertThat(info.getProducesCondition().getProducibleMediaTypes().iterator().next().toString()).isEqualTo(MediaType.APPLICATION_JSON_VALUE);
+		assertThat(info.getConsumesCondition().getConsumableMediaTypes().iterator().next().toString())
+				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
+		assertThat(info.getProducesCondition().getProducibleMediaTypes().iterator().next().toString())
+				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
 	}
 
 	@Test // SPR-14988