Skip to content

Commit a97c8b0

Browse files
committed
Update docs tests with nested query param. Rename context files to better differentiate them.
1 parent 973df08 commit a97c8b0

File tree

6 files changed

+19
-5
lines changed

6 files changed

+19
-5
lines changed

docs/src/main/java/com/mattbertolini/spring/web/bind/docs/NestedBean.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,17 @@
1616

1717
package com.mattbertolini.spring.web.bind.docs;
1818

19+
import com.mattbertolini.spring.web.bind.annotation.RequestParameter;
20+
1921
public class NestedBean {
22+
@RequestParameter("nested_request_param")
23+
private String nestedRequestParameter;
24+
25+
public String getNestedRequestParameter() {
26+
return nestedRequestParameter;
27+
}
28+
29+
public void setNestedRequestParameter(String nestedRequestParameter) {
30+
this.nestedRequestParameter = nestedRequestParameter;
31+
}
2032
}

docs/src/main/java/com/mattbertolini/spring/web/bind/docs/webflux/ExampleContext.java renamed to docs/src/main/java/com/mattbertolini/spring/web/bind/docs/webflux/ExampleWebFluxContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
@Configuration
2727
@EnableWebFlux
28-
public class ExampleContext {
28+
public class ExampleWebFluxContext {
2929
@Bean
3030
public BinderConfiguration binderConfiguration() {
3131
return new BinderConfiguration();

docs/src/main/java/com/mattbertolini/spring/web/bind/docs/webmvc/ExampleContext.java renamed to docs/src/main/java/com/mattbertolini/spring/web/bind/docs/webmvc/ExampleMvcContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
@Configuration
2727
@EnableWebMvc
28-
public class ExampleContext {
28+
public class ExampleMvcContext {
2929
// tag::javaMvcConfiguration[]
3030
@Bean
3131
public BinderConfiguration binderConfiguration() {

docs/src/test/java/com/mattbertolini/spring/web/bind/docs/webflux/WebFluxDocsJavaConfigIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import static org.springframework.web.reactive.function.BodyInserters.fromFormData;
2727

28-
@SpringJUnitWebConfig(classes = {ExampleContext.class})
28+
@SpringJUnitWebConfig(classes = {ExampleWebFluxContext.class})
2929
class WebFluxDocsJavaConfigIntegrationTest {
3030
private WebTestClient webTestClient;
3131

@@ -37,7 +37,7 @@ void setUp(WebApplicationContext webApplicationContext) {
3737
@Test
3838
void makesRequestAndBindsData() {
3939
webTestClient.post()
40-
.uri("/example/42?different_name=different_value")
40+
.uri("/example/42?different_name=different_value&nested_request_param=nested")
4141
.accept(MediaType.TEXT_PLAIN)
4242
.contentType(MediaType.APPLICATION_FORM_URLENCODED)
4343
.body(fromFormData("form_data_", "form_value"))

docs/src/test/java/com/mattbertolini/spring/web/bind/docs/webmvc/WebMvcDocsJavaConfigIntegrationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
3030
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
3131

32-
@SpringJUnitWebConfig(classes = {ExampleContext.class})
32+
@SpringJUnitWebConfig(classes = {ExampleMvcContext.class})
3333
class WebMvcDocsJavaConfigIntegrationTest {
3434

3535
private MockMvc mockMvc;
@@ -49,6 +49,7 @@ void makesRequestAndBindsData() throws Exception {
4949
.header("X-Custom-Header", "A_Header_Value")
5050
.cookie(new Cookie("cookie_value", "some_cookie_value"))
5151
.queryParam("different_name", "different_value")
52+
.queryParam("nested_request_param", "nested")
5253
.sessionAttr("sessionAttribute", "sessionValue"))
5354
.andExpect(status().isOk());
5455
}

docs/src/test/java/com/mattbertolini/spring/web/bind/docs/webmvc/WebMvcDocsXmlConfigIntegrationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ void makesRequestAndBindsData() throws Exception {
4949
.header("X-Custom-Header", "A_Header_Value")
5050
.cookie(new Cookie("cookie_value", "some_cookie_value"))
5151
.queryParam("different_name", "different_value")
52+
.queryParam("nested_request_param", "nested")
5253
.sessionAttr("sessionAttribute", "sessionValue"))
5354
.andExpect(status().isOk());
5455
}

0 commit comments

Comments
 (0)