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

Fix URI override for HttpExchange

Browse Source 
Closes gh-29624
This commit is contained in:
rstoyanchev
2022-12-02 17:01:54 +00:00
parent 0ccd2f8b87
commit a09f93768a
4 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/test/java/org/springframework/web/service/invoker/UrlArgumentResolverTests.java
View File

@@ -21,6 +21,7 @@ import java.net.URI;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.lang.Nullable;
import org.springframework.web.service.annotation.GetExchange;
import static org.assertj.core.api.Assertions.assertThat;
@@ -51,7 +52,7 @@ public class UrlArgumentResolverTests {
this.service.execute(dynamicUrl);
assertThat(getRequestValues().getUri()).isEqualTo(dynamicUrl);
assertThat(getRequestValues().getUriTemplate()).isNull();
assertThat(getRequestValues().getUriTemplate()).isEqualTo("/path");
}
@Test
@@ -67,7 +68,9 @@ public class UrlArgumentResolverTests {
@Test
void ignoreNull() {
this.service.execute(null);
assertThat(getRequestValues().getUri()).isNull();
assertThat(getRequestValues().getUriTemplate()).isEqualTo("/path");
}
private HttpRequestValues getRequestValues() {
@@ -78,7 +81,7 @@ public class UrlArgumentResolverTests {
private interface Service {
@GetExchange("/path")
void execute(URI uri);
void execute(@Nullable URI uri);
@GetExchange
void executeNotUri(String other);