Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid pathVar-requestParam name collision

Browse Source 
Closes gh-34499
This commit is contained in:
rstoyanchev
2025-02-26 19:03:12 +00:00
parent f92f9c1d5b
commit f62251aebd
3 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-web/src/test/java/org/springframework/web/service/invoker/HttpRequestValuesTests.java
View File

@@ -79,17 +79,19 @@ class HttpRequestValuesTests {
assertThat(uriTemplate)
.isEqualTo("/path?" +
"{param1}={param1[0]}&" +
"{param2}={param2[0]}&" +
"{param2}={param2[1]}");
"{queryParam-param1}={queryParam-param1[0]}&" +
"{queryParam-param2}={queryParam-param2[0]}&" +
"{queryParam-param2}={queryParam-param2[1]}");
assertThat(requestValues.getUriVariables())
.containsOnlyKeys("param1", "param2", "param1[0]", "param2[0]", "param2[1]")
.containsEntry("param1", "param1")
.containsEntry("param2", "param2")
.containsEntry("param1[0]", "1st value")
.containsEntry("param2[0]", "2nd value A")
.containsEntry("param2[1]", "2nd value B");
.containsOnlyKeys(
"queryParam-param1", "queryParam-param2", "queryParam-param1[0]",
"queryParam-param2[0]", "queryParam-param2[1]")
.containsEntry("queryParam-param1", "param1")
.containsEntry("queryParam-param2", "param2")
.containsEntry("queryParam-param1[0]", "1st value")
.containsEntry("queryParam-param2[0]", "2nd value A")
.containsEntry("queryParam-param2[1]", "2nd value B");
URI uri = UriComponentsBuilder.fromUriString(uriTemplate)
.encode()
@@ -107,7 +109,7 @@ class HttpRequestValuesTests {
.build();
String uriTemplate = requestValues.getUriTemplate();
assertThat(uriTemplate).isEqualTo("/path?{userId%3Aeq}={userId%3Aeq[0]}");
assertThat(uriTemplate).isEqualTo("/path?{queryParam-userId%3Aeq}={queryParam-userId%3Aeq[0]}");
URI uri = UriComponentsBuilder.fromUriString(uriTemplate)
.encode()
@@ -162,7 +164,7 @@ class HttpRequestValuesTests {
String uriTemplate = requestValues.getUriTemplate();
assertThat(uriTemplate).isNotNull();
assertThat(uriTemplate).isEqualTo("/path?{query param}={query param[0]}");
assertThat(uriTemplate).isEqualTo("/path?{queryParam-query param}={queryParam-query param[0]}");
URI uri = UriComponentsBuilder.fromUriString(uriTemplate)
.encode()

22
spring-web/src/test/java/org/springframework/web/service/invoker/PathVariableArgumentResolverTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,11 +16,15 @@
package org.springframework.web.service.invoker;
import java.net.URI;
import org.junit.jupiter.api.Test;
import org.springframework.lang.Nullable;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.service.annotation.GetExchange;
import org.springframework.web.util.DefaultUriBuilderFactory;
import static org.assertj.core.api.Assertions.assertThat;
@@ -46,6 +50,17 @@ class PathVariableArgumentResolverTests {
assertPathVariable("id", "test");
}
@Test // gh-34499
void pathVariableAndRequestParamWithSameName() {
this.service.executeWithPathVarAndRequestParam("{transfer-id}", "aValue");
assertPathVariable("transfer-id", "{transfer-id}");
HttpRequestValues values = this.client.getRequestValues();
URI uri = (new DefaultUriBuilderFactory()).expand(values.getUriTemplate(), values.getUriVariables());
assertThat(uri.toString()).isEqualTo("/transfers/%7Btransfer-id%7D?transfer-id=aValue");
}
@SuppressWarnings("SameParameterValue")
private void assertPathVariable(String name, @Nullable String expectedValue) {
assertThat(this.client.getRequestValues().getUriVariables().get(name)).isEqualTo(expectedValue);
@@ -57,6 +72,11 @@ class PathVariableArgumentResolverTests {
@GetExchange
void execute(@PathVariable String id);
@GetExchange("/transfers/{transfer-id}")
void executeWithPathVarAndRequestParam(
@PathVariable("transfer-id") String transferId,
@RequestParam("transfer-id") String transferIdParam);
}
}